This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjettison-java.
commit a57f20d72a9235b57da4284f1e05850647daf9a7 Author: Emmanuel Bourg <[email protected]> Date: Fri Apr 20 14:43:35 2018 +0200 Build with Maven instead of Ant --- debian/ant.properties | 4 -- debian/build.xml | 23 --------- debian/changelog | 4 +- debian/control | 6 ++- debian/libjettison-java.poms | 2 +- debian/maven.ignoreRules | 1 + debian/maven.rules | 2 + debian/pom.xml | 120 ------------------------------------------- debian/rules | 12 +---- 9 files changed, 12 insertions(+), 162 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index 9794025..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,4 +0,0 @@ -project.name=jettison -class.dir=build -source.dir=. -jar=jettison.jar diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index f295b88..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project default="jar" name="${project.name}" basedir=".."> - - <target name="clean"> - <delete dir="${class.dir}" quiet="true"/> - </target> - - <target name="compile" description="o Compile the source files"> - <mkdir dir="${class.dir}"/> - <javac srcdir="${source.dir}" destdir="${class.dir}" - debug="true" source="1.5" target="1.5"/> - </target> - - <target name="jar" description="o Create the jar" depends="compile"> - <jar jarfile="${jar}"> - <fileset dir="${class.dir}"> - <include name="**"/> - </fileset> - </jar> - </target> - -</project> diff --git a/debian/changelog b/debian/changelog index da795e5..6d58bce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -libjettison-java (1.2-4) UNRELEASED; urgency=medium +libjettison-java (1.3.1-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Build with Maven instead of Ant * Build with the DH sequencer instead of CDBS * Moved the package to Git * Standards-Version updated to 4.1.4 diff --git a/debian/control b/debian/control index 3c8d732..82299a4 100644 --- a/debian/control +++ b/debian/control @@ -4,10 +4,12 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> Build-Depends: - ant, debhelper (>= 11), default-jdk, - maven-repo-helper + junit, + libmaven-bundle-plugin-java, + libwoodstox-java, + maven-debian-helper Standards-Version: 4.1.4 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjettison-java.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjettison-java.git diff --git a/debian/libjettison-java.poms b/debian/libjettison-java.poms index 8863dec..9ac7e64 100644 --- a/debian/libjettison-java.poms +++ b/debian/libjettison-java.poms @@ -1 +1 @@ -debian/pom.xml --has-package-version --java-lib --artifact=jettison.jar +pom.xml --no-parent --has-package-version --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..06872d7 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1 @@ +org.apache.maven.wagon wagon-webdav diff --git a/debian/maven.rules b/debian/maven.rules index 9732956..a249406 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,2 +1,4 @@ # Force installed POM to use "jar" packaging org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * * +junit junit * s/.*/3.x/ * * +s/woodstox/org.codehaus.woodstox/ s/wstx-asl/woodstox-core-lgpl/ * s/.*/debian/ * * diff --git a/debian/pom.xml b/debian/pom.xml deleted file mode 100644 index afdf74e..0000000 --- a/debian/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <version>1.2</version> - <packaging>bundle</packaging> - <name>Jettison</name> - <description>A StAX implementation for JSON.</description> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>woodstox</groupId> - <artifactId>wstx-asl</artifactId> - <version>3.2.2</version> - <scope>test</scope> - </dependency> - </dependencies> - <scm> - <connection>scm:svn:https://svn.codehaus.org/jettison/tags/jettison-1.2</connection> - <developerConnection>scm:svn:https://svn.codehaus.org/jettison/tags/jettison-1.2</developerConnection> - <url>https://svn.codehaus.org/jettison/tags/jettison-1.2</url> - </scm> - <build> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - <optimize>true</optimize> - <debug>true</debug> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> - </plugin> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.codehaus.org/jettison/tags/</tagBase> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <version>1.0.0</version> - <configuration> - <instructions> - <Bundle-Name>${artifactId}</Bundle-Name> - <Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName> - <Export-Package>org.codehaus.jettison*;version=${project.version}</Export-Package> - <Import-Package>*</Import-Package> - <Private-Package>!*</Private-Package> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - </instructions> - </configuration> - </plugin> - - </plugins> - - </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>pertest</forkMode> - </configuration> - </plugin> - </plugins> - </reporting> - - <distributionManagement> - <repository> - <id>codehaus.org</id> - <name>jettison Central Repository</name> - <url>dav:https://dav.codehaus.org/repository/jettison/</url> - </repository> - <snapshotRepository> - <id>codehaus.org</id> - <name>jettison Central Development Repository</name> - <url>dav:https://dav.codehaus.org/snapshots.repository/jettison/</url> - </snapshotRepository> - <site> - <id>codehaus.org</id> - <url>dav:https://dav.codehaus.org/jettison/</url> - </site> - </distributionManagement> - -</project> \ No newline at end of file diff --git a/debian/rules b/debian/rules index b2037e0..2d33f6a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,4 @@ #!/usr/bin/make -f %: - dh $@ --buildsystem=ant --with maven-repo-helper - -override_dh_auto_build: - dh_auto_build -- -f debian/build.xml - -override_dh_auto_clean: - dh_auto_build -- -f debian/build.xml clean - -get-orig-pom: - wget -U NoSuchBrowser/1.0 -O debian/pom.xml \ - https://repo1.maven.org/maven2/org/codehaus/jettison/jettison/$(DEB_UPSTREAM_VERSION)/jettison-$(DEB_UPSTREAM_VERSION).pom + dh $@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjettison-java.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
