This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openid4java.
commit d94971c3bf9bfe0d7313f2de055f6ad929edcbff Author: Emmanuel Bourg <ebo...@apache.org> Date: Sun Dec 3 23:07:40 2017 +0100 Build with Maven instead of Ant --- debian/changelog | 4 ++- debian/control | 11 ++++--- debian/libopenid4java-java-doc.javadoc | 1 - debian/libopenid4java-java.manifest | 3 -- debian/libopenid4java-java.poms | 2 +- debian/maven.ignoreRules | 9 +++++ debian/maven.properties | 5 +++ debian/maven.rules | 4 ++- debian/patches/buildxml.patch | 43 ------------------------ debian/patches/series | 1 - debian/pom.xml | 60 ---------------------------------- debian/rules | 14 +------- 12 files changed, 28 insertions(+), 129 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f46e9a..11f6ea9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openid4java (0.9.6.662-4) UNRELEASED; urgency=medium +openid4java (1.0.0-1) UNRELEASED; urgency=medium * Team upload. @@ -9,6 +9,8 @@ openid4java (0.9.6.662-4) UNRELEASED; urgency=medium * Update copyright info. [ Emmanuel Bourg ] + * New upstream release + * Build with Maven instead of Ant * Standards-Version updated to 4.1.1 -- Miguel Landaeta <nomad...@debian.org> Wed, 09 Aug 2017 21:14:32 +0100 diff --git a/debian/control b/debian/control index bc58d87..4edb3ba 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Olivier Weinstoerffer <olivier.weinstoerf...@gmail.com> Build-Depends: - ant, debhelper (>= 10~), default-jdk, javahelper (>= 0.32), @@ -15,11 +14,13 @@ Build-Depends: libguice-java, libhttpclient-java, libhttpcore-java, + libmaven-antrun-plugin-java, + libmaven-javadoc-plugin-java, libnekohtml-java, libservlet3.1-java, libspring-jdbc-java, libspring-transaction-java, - maven-repo-helper + maven-debian-helper (>= 2.2) Standards-Version: 4.1.1 Vcs-Git: https://anonscm.debian.org/git/pkg-java/openid4java.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/openid4java.git @@ -27,8 +28,8 @@ Homepage: https://github.com/jbufu/openid4java Package: libopenid4java-java Architecture: all -Suggests: libopenid4java-java-doc -Depends: ${java:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends} Description: This library allows you to OpenID-enable your Java webapp OpenID starts with the concept that anyone can identify themselves on the Internet the same way websites do - with a URI. Since URIs are at the very core @@ -52,7 +53,7 @@ Package: libopenid4java-java-doc Architecture: all Section: doc Suggests: libopenid4java-java -Depends: ${java:Depends}, ${misc:Depends} +Depends: ${misc:Depends} Description: documentation for libopenid4java Documentation for openid4java that is library that provide OpenID features to Java webapps. diff --git a/debian/libopenid4java-java-doc.javadoc b/debian/libopenid4java-java-doc.javadoc deleted file mode 100644 index 73f8507..0000000 --- a/debian/libopenid4java-java-doc.javadoc +++ /dev/null @@ -1 +0,0 @@ -apidoc diff --git a/debian/libopenid4java-java.manifest b/debian/libopenid4java-java.manifest deleted file mode 100644 index 449ef0f..0000000 --- a/debian/libopenid4java-java.manifest +++ /dev/null @@ -1,3 +0,0 @@ -usr/share/java/openid4java.jar: - Class-Path: /usr/share/java/commons-codec.jar /usr/share/java/commons-logging.jar /usr/share/java/httpclient.jar /usr/share/java/httpcore.jar /usr/share/java/guice.jar /usr/share/java/ehcache.jar /usr/share/java/spring3-transaction.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/spring3-core.jar /usr/share/java/spring3-beans.jar /usr/share/java/xercesImpl.jar /usr/share/java/nekohtml.jar - diff --git a/debian/libopenid4java-java.poms b/debian/libopenid4java-java.poms index 1a7e280..433f4e1 100644 --- a/debian/libopenid4java-java.poms +++ b/debian/libopenid4java-java.poms @@ -1 +1 @@ -debian/pom.xml +pom.xml --has-package-version --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..b2854ec --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,9 @@ +hsqldb hsqldb +jdom jdom +jetty * * * * * +junit junit +net.sourceforge.jwebunit jwebunit-htmlunit-plugin +org.apache.maven.plugins maven-source-plugin +org.codehaus.mojo cobertura-maven-plugin +org.codehaus.mojo findbugs-maven-plugin +org.codehaus.mojo properties-maven-plugin diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..e593715 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,5 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.skip=true diff --git a/debian/maven.rules b/debian/maven.rules index dc2801e..882f0f9 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,2 +1,4 @@ org.springframework * jar s/.*/3.x/ * * -javax.servlet javax.servlet-api * * * * +javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * * +net.sf.ehcache s/ehcache/ehcache-core/ * s/.*/debian/ * * +s/xml-security/org.apache.santuario/ xmlsec * s/.*/debian/ * * diff --git a/debian/patches/buildxml.patch b/debian/patches/buildxml.patch deleted file mode 100644 index cb569ea..0000000 --- a/debian/patches/buildxml.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: patches the build.xml in order to compile against the dpkg libs. -Author: 2010, Olivier Weinstoerffer <olivier.weinstoerf...@gmail.com> -Index: openid4java-0.9.5.593/build.xml -=================================================================== ---- openid4java-0.9.5.593.orig/build.xml 2010-12-20 23:15:29.000000000 +0000 -+++ openid4java-0.9.5.593/build.xml 2010-12-20 23:53:05.000000000 +0000 -@@ -30,10 +30,26 @@ - - <target name="create_paths" depends="dist_type"> - <path id="classpath"> -- <fileset dir="${lib.dir}"> -+ <!--fileset dir="${lib.dir}"> - <include name="**/*.jar"/> - <exclude name="lib/xri/**" unless="include.xri"/> - <exclude name="lib/infocard/**" unless="include.infocard"/> -+ </fileset--> -+ <fileset dir="/usr/share/java"> -+ <include name="atinject-jsr330-api.jar"/> -+ <include name="commons-codec.jar"/> -+ <include name="commons-logging.jar"/> -+ <include name="guice.jar"/> -+ <include name="httpclient.jar"/> -+ <include name="httpcore.jar"/> -+ <include name="ehcache.jar"/> -+ <include name="servlet-api-3.1.jar"/> -+ <include name="spring3-transaction.jar"/> -+ <include name="spring3-jdbc.jar"/> -+ <include name="spring3-core.jar"/> -+ <include name="spring3-beans.jar"/> -+ <include name="xercesImpl.jar"/> -+ <include name="nekohtml.jar"/> - </fileset> - </path> - </target> -@@ -88,7 +100,7 @@ - <echo>Version: ${version}</echo> - </target> - -- <target name="jar" depends="compile, get-version" -+ <target name="jar" depends="compile,apidoc" - description="Packages compiled class files into a jar archive"> - <jar jarfile="${build}/${component.name}${dist.type}.jar"> - <fileset dir="${classes}"/> diff --git a/debian/patches/series b/debian/patches/series index a7c2f32..0504274 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -buildxml.patch ehcache.patch diff --git a/debian/pom.xml b/debian/pom.xml deleted file mode 100644 index 6976375..0000000 --- a/debian/pom.xml +++ /dev/null @@ -1,60 +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.openid4java</groupId> - <artifactId>openid4java</artifactId> - <packaging>jar</packaging> - <name>OpenID4Java</name> - <version>0.9.6</version> - <dependencies> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>debian</version> - </dependency> - <dependency> - <groupId>net.sourceforge.nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>debian</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - <version>1.3.0</version> - </dependency> - - <!-- Discovery --> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> - - <!-- JdbcServerAssociationStore --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <version>3.x</version> - </dependency> - - <!-- Sample Consumer --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1</version> - </dependency> - - </dependencies> - -</project> diff --git a/debian/rules b/debian/rules index ae70477..1f7f7c8 100755 --- a/debian/rules +++ b/debian/rules @@ -2,20 +2,8 @@ include /usr/share/dpkg/default.mk -export JAVA_HOME=/usr/lib/jvm/default-java - %: - dh $@ --with javahelper - -override_jh_installlibs: - mh_installpoms -plib$(DEB_SOURCE)-java - mh_installjar -plib$(DEB_SOURCE)-java --usj-version=$(DEB_VERSION_UPSTREAM) \ - --usj-name=$(DEB_SOURCE) \ - -l debian/pom.xml build/$(DEB_SOURCE).jar - -override_dh_clean: - dh_clean - mh_clean + dh $@ --buildsystem=maven --with javahelper get-orig-source: cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openid4java.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits