From cf7e676edc7ab9d4b8b130ca4d8ecbd291995dea Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 20 Apr 2020 09:29:12 +0200
Subject: [PATCH] Adapt build

---
 build.xml | 61 +++----------------------------------------------------
 1 file changed, 3 insertions(+), 58 deletions(-)

diff --git a/build.xml b/build.xml
index ed632c2..d80abff 100644
--- a/build.xml
+++ b/build.xml
@@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file.
 
 	<!-- Compilation class path -->
 	<path id="base.class.path">
-		<pathelement location="${jaxen.jar}" />
-		<pathelement location="${parser.jar}" />
-		<pathelement location="${xmlapi.jar}" />
-		<pathelement location="${junit.jar}" />
-		<pathelement location="${isorelax.jar}" />
-		<pathelement location="${xalan.jar}" />
-		<pathelement location="${xalanser.jar}" />
-		<!-- normally these stax jars will not be found -->
-		<!-- this is used for testing Java5 (the test sets stax.dir) -->
-		<pathelement location="${stax.dir}/jsr173_1.0_api.jar" />
-		<pathelement location="${stax.dir}/sjsxp.jar" />
+		<fileset dir="${lib.dir}" includes="*.jar" />
 	</path>
 
 	<path id="core.class.path">
@@ -296,7 +286,7 @@ For instructions on how to build JDOM, please view the README.txt file.
 	<!-- =================================================================== -->
 	<!-- Creates the jars                                           -->
 	<!-- =================================================================== -->
-	<target name="jars" depends="compile, javadoc"
+	<target name="jars" depends="compile.core, javadoc"
 	    description="Builds the Jars">
 		<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
 		<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
@@ -316,27 +306,6 @@ For instructions on how to build JDOM, please view the README.txt file.
 			<fileset dir="${core.build}" includes="**/*.class" />
 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
 		</jar>
-		<jar jarfile="${package}/${jarbase}-contrib.jar" >
-			<fileset dir="${contrib.build}" includes="**/*" />
-			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
-		</jar>
-		<jar jarfile="${package}/${jarbase}-junit.jar" >
-			<fileset dir="${junit.build}" includes="**/*" />
-			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
-		</jar>
-		<jar destfile="${package}/${jarbase}-javadoc.jar" 
-			basedir="${build.javadocs}" includes="**/*" />
-
-		<jar jarfile="${package}/${jarbase}-sources.jar" >
-			<fileset dir="${core.src}" includes="**/*" />
-		</jar>
-		<jar jarfile="${package}/${jarbase}-junit-sources.jar" >
-			<fileset dir="${junit.src}" includes="**/*" />
-		</jar>
-		<jar jarfile="${package}/${jarbase}-contrib-sources.jar" >
-			<fileset dir="${contrib.src}" includes="**/*" />
-		</jar>
-	    	    
 	</target>
 	
 	<target name="androidtests" depends="jars">
@@ -505,7 +474,7 @@ For instructions on how to build JDOM, please view the README.txt file.
 		<delete dir="${mavendir}" includes="**/*" failonerror="false"/>
 	</target>
 	
-	<target name="maven" depends="maven.clean, package"
+	<target name="maven" depends="maven.clean, jars"
 		description="Prepares Maven bundle to load on to Sonatype Nexus for Maven-Central">
 		<mkdir dir="${mavendir}" />
 		<mkdir dir="${mavendir}/core" />
@@ -517,8 +486,6 @@ For instructions on how to build JDOM, please view the README.txt file.
 		
 		<!-- copy the build jar -->
 		<copy tofile="${mavendir}/core/${mavenbase}.jar" file="${package}/${jarbase}.jar"/>
-		<copy tofile="${mavendir}/core/${mavenbase}-javadoc.jar" file="${package}/${jarbase}-javadoc.jar"/>
-		<copy tofile="${mavendir}/core/${mavenbase}-sources.jar" file="${package}/${jarbase}-sources.jar"/>
 		
 		<!-- load the license in to the ${license} property -->
 		<loadfile property="license" srcfile="LICENSE.txt" />
@@ -532,28 +499,6 @@ For instructions on how to build JDOM, please view the README.txt file.
 				<filter token="license" value="${license}" />
 			</filterset>
 		</copy>
-		
-		<exec dir="${mavendir}/core" executable="${gpg}">
-			<arg value="-abv"/>
-			<arg value="${mavenbase}.pom"/>
-		</exec>
-		<exec dir="${mavendir}/core" executable="${gpg}">
-			<arg value="-abv"/>
-			<arg value="${mavenbase}.jar"/>
-		</exec>
-		<exec dir="${mavendir}/core" executable="${gpg}">
-			<arg value="-abv"/>
-			<arg value="${mavenbase}-sources.jar"/>
-		</exec>
-		<exec dir="${mavendir}/core" executable="${gpg}">
-			<arg value="-abv"/>
-			<arg value="${mavenbase}-javadoc.jar"/>
-		</exec>
-		
-		<jar destfile="${mavendir}/${mavenbase}-maven-bundle.jar"
-			basedir="${mavendir}/core"
-			includes="${mavenbase}*" excludes="*maven-bundle*" />
-		
 	</target>
 	
 </project>
-- 
2.37.2