Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update build process to include jdom-contrib artifacts for maven.

  • Loading branch information...
commit a9a2f863c55fd4709dcc46e17f0ad4afa8a7817e 1 parent 1c453a9
@rolfl rolfl authored
View
2  .gitignore
@@ -6,3 +6,5 @@ build
/ebuild
/tmp
/.settings
+/dist.*
+/dist-*
View
24 build.xml
@@ -1,14 +1,14 @@
-<project name="ant-demo" default="dist" basedir="." >
+<project name="jdom.1.x" default="dist" basedir="." >
<!-- define Maven coordinates -->
<property name="groupId" value="org.jdom" />
<property name="artifactId" value="jdom" />
- <property name="version" value="1.x-snapshot" />
+ <property name="version" value="1.SNAPSHOT" />
<property name="gpg" value="gpg"
description="Path to the GNU gpg program for maven target"/>
- <property name="dist" value="dist" />
+ <property name="dist" value="dist-${version}" />
<target name="build.core">
<ant dir="core" target="master" >
@@ -105,6 +105,24 @@
basedir="${mavendir}"
includes="${jarbase}*" excludes="*maven-bundle*" />
+ <property name="contribbase" value="jdom-contrib-${version}" />
+
+ <copy filtering="true" file="maven-contrib.pom" tofile="${dist}/${contribbase}.pom">
+ <filterset>
+ <filter token="artifactID" value="jdom-contrib"/>
+ <filter token="version" value="${version}" />
+ <filter token="jdk" value="1.2" />
+ </filterset>
+ </copy>
+
+ <exec dir="${mavendir}" command="${gpg} -abv ${contribbase}.pom"/>
+ <exec dir="${mavendir}" command="${gpg} -abv ${contribbase}.jar"/>
+ <exec dir="${mavendir}" command="${gpg} -abv ${contribbase}-sources.jar"/>
+ <exec dir="${mavendir}" command="${gpg} -abv ${contribbase}-javadoc.jar"/>
+
+ <jar destfile="${mavendir}/${contribbase}-maven-bundle.jar"
+ basedir="${mavendir}"
+ includes="${contribbase}*" excludes="*maven-bundle*" />
</target>
View
6 contrib/build.xml
@@ -237,12 +237,16 @@ These are the meaningful targets for this build file:
<!-- =================================================================== -->
<!-- Creates the class package -->
<!-- =================================================================== -->
- <target name="package" depends="clean,compile">
+ <target name="package" depends="clean,compile,javadoc">
<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
<jar jarfile="${build.dir}/${name}.jar"
basedir="${build.dest}"
includes="org/**"/>
+ <jar jarfile="${build.dir}/${name}-sources.jar"
+ basedir="${build.src}" />
+ <jar jarfile="${build.dir}/${name}-javadoc.jar"
+ basedir="${build.javadocs}" />
</target>
<!-- =================================================================== -->
View
80 maven-contrib.pom
@@ -0,0 +1,80 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jdom</groupId>
+ <artifactId>@artifactID@</artifactId>
+ <packaging>jar</packaging>
+
+ <name>JDOM</name>
+ <version>@version@</version>
+
+ <description>
+ A complete, Java-based solution for accessing, manipulating,
+ and outputting XML data
+ </description>
+ <url>http://www.jdom.org</url>
+
+ <organization>
+ <name>JDOM</name>
+ <url>http://www.jdom.org</url>
+ </organization>
+
+ <mailingLists>
+ <mailingList>
+ <name>JDOM-interest Mailing List</name>
+ <post>jdom-interest@jdom.org</post>
+ <archive>http://jdom.markmail.org/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <licenses>
+ <license>
+ <name>Similar to Apache License but with the acknowledgment clause removed</name>
+ <url>https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <url>git@github.com:/hunterhacker/jdom</url>
+ <connection>scm:git:git@github.com:hunterhacker/jdom</connection>
+ <developerConnection>scm:git:git@github.com:hunterhacker/jdom</developerConnection>
+ </scm>
+
+ <developers>
+ <developer>
+ <id>hunterhacker</id>
+ <name>Jason Hunter</name>
+ <email>jhunter@servlets.com</email>
+ </developer>
+ <developer>
+ <id>rolfl</id>
+ <name>Rolf Lear</name>
+ <email>jdom@tuis.net</email>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>@version@</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.10.0</version>
+ <optional>true</optional>
+ </dependency>
+
+ </dependencies>
+
+ <properties>
+ <jdk.version>@jdk@</jdk.version>
+ </properties>
+</project>
View
2  maven.pom
@@ -58,7 +58,7 @@
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.3</version>
- <scope>compile</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>xerces</groupId>
Please sign in to comment.
Something went wrong with that request. Please try again.