91 lines
3.3 KiB
Diff
91 lines
3.3 KiB
Diff
From c4e8813644a76df380965d2b6de02d280af76bbf Mon Sep 17 00:00:00 2001
|
|
From: Michael Simacek <msimacek@redhat.com>
|
|
Date: Tue, 14 Jul 2015 11:20:59 +0200
|
|
Subject: [PATCH 1/2] Jar paths
|
|
|
|
---
|
|
build.xml | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/build.xml b/build.xml
|
|
index 73e064f..36b922b 100644
|
|
--- a/build.xml
|
|
+++ b/build.xml
|
|
@@ -49,7 +49,7 @@
|
|
<property name="maven-staging-repository-url" value="https://oss.sonatype.org/service/local/staging/deploy/maven2/" />
|
|
|
|
<!-- DEPENDENCIES -->
|
|
- <available property='bcel.available' file='${lib.dir}/bcel-5.2.jar' />
|
|
+ <available property='bcel.available' file='${lib.dir}/bcel.jar' />
|
|
|
|
<property name="xerces.version" value="2.12.2"/>
|
|
|
|
@@ -78,7 +78,7 @@
|
|
source='${compile.source}' target='${compile.target}'
|
|
includeAntRuntime='false'>
|
|
<classpath>
|
|
- <fileset dir='${lib.dir}/xerces-@{xercesVersion}' includes='*.jar' />
|
|
+ <fileset dir='${lib.dir}' includes='xerces-j2.jar' />
|
|
</classpath>
|
|
<src path='${src.dir}' />
|
|
<src path='${build.src.dir}' />
|
|
@@ -89,7 +89,7 @@
|
|
source='${compile.source}' target='${compile.target}'
|
|
includeAntRuntime='false'>
|
|
<classpath>
|
|
- <fileset dir='${lib.dir}/xerces-@{xercesVersion}' includes='*.jar' />
|
|
+ <fileset dir='${lib.dir}' includes='xerces-j2.jar' />
|
|
</classpath>
|
|
<src path='${src.dir}' />
|
|
<src path='${build.src.dir}' />
|
|
@@ -174,7 +174,7 @@
|
|
doctitle="${Name}" encoding="ISO-8859-1"
|
|
bottom="${copyright}">
|
|
<classpath>
|
|
- <fileset dir='${lib.dir}/xerces-${xerces.version}' includes='*.jar' />
|
|
+ <fileset dir='${lib.dir}' includes='*.jar' />
|
|
</classpath>
|
|
</javadoc>
|
|
</target>
|
|
@@ -224,7 +224,7 @@ public class Version {
|
|
<java classname='org.apache.tools.ant.Main'>
|
|
<classpath>
|
|
<pathelement path='${java.class.path}' />
|
|
- <pathelement location='${lib.dir}/bcel-5.2.jar' />
|
|
+ <pathelement location='${lib.dir}/bcel.jar' />
|
|
</classpath>
|
|
<arg value='x-minimal' />
|
|
</java>
|
|
@@ -266,7 +266,7 @@ public class Version {
|
|
includeAntRuntime='true'>
|
|
<classpath>
|
|
<fileset dir='${lib.dir}' includes='junit*.jar' />
|
|
- <fileset dir='${lib.dir}/xerces-${xerces.version}' includes='xml-apis*.jar,xerces*.jar' />
|
|
+ <fileset dir='${lib.dir}' includes='xml-apis*.jar,xerces*.jar' />
|
|
<pathelement location='${build.classes.dir}' />
|
|
</classpath>
|
|
<src path='${src.test.dir}' />
|
|
@@ -287,8 +287,8 @@ public class Version {
|
|
<classpath>
|
|
<pathelement path='${build.test-classes.dir}'/>
|
|
<pathelement location='${build.classes.dir}' />
|
|
- <fileset dir='${lib.dir}' includes='junit*.jar' />
|
|
- <fileset dir='${lib.dir}/xerces-@{xercesVersion}' includes='*.jar' />
|
|
+ <fileset dir='${lib.dir}' includes='junit.jar' />
|
|
+ <fileset dir='${lib.dir}' includes='xerces-j2.jar' />
|
|
</classpath>
|
|
|
|
<formatter type="xml"/>
|
|
@@ -376,7 +376,7 @@ public class Version {
|
|
</target>
|
|
|
|
<target name="-defineMavenAntTasks">
|
|
- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
|
|
+ <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks.jar" />
|
|
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
|
|
classpathref="maven-ant-tasks.classpath" />
|
|
<artifact:pom id="maven.project" file="pom.xml" />
|
|
--
|
|
2.36.0
|
|
|