This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjgroups-java.
commit ca24caee1cbd5f4bc57eece6c27f6d93ceb779d8 Author: Emmanuel Bourg <ebo...@apache.org> Date: Thu Nov 23 13:09:15 2017 +0100 Build with Maven instead of Ant --- debian/ant.properties | 1 - debian/changelog | 1 + debian/control | 11 +++++------ debian/libjgroups-java.poms | 1 + debian/maven.ignoreRules | 1 + debian/maven.rules | 1 + debian/rules | 22 +++------------------- 7 files changed, 12 insertions(+), 26 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index e9d87d4..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1 +0,0 @@ -build.sysclasspath=first diff --git a/debian/changelog b/debian/changelog index ad7fe27..d66cfd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ libjgroups-java (2.12.2.Final-5) UNRELEASED; urgency=medium + * Build with Maven instead of Ant * Removed the unused build dependency on glassfish-javaee * Moved the package to Git * Standards-Version updated to 4.1.1 diff --git a/debian/control b/debian/control index 1c69e02..0ea1d06 100644 --- a/debian/control +++ b/debian/control @@ -8,17 +8,16 @@ Uploaders: Brian Thomason <brian.thoma...@eucalyptus.com>, Emmanuel Bourg <ebo...@apache.org> Build-Depends: - ant, - ant-optional, bsh, - cdbs, debhelper (>= 10), default-jdk, junit, libcommons-logging-java, liblog4j1.2-java, + libmaven-antrun-plugin-java, + libmaven-bundle-plugin-java, libxalan2-java, - maven-repo-helper, + maven-debian-helper (>= 2.2), testng Standards-Version: 4.1.1 Homepage: http://www.jgroups.org/javagroupsnew/docs/index.html @@ -27,8 +26,8 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjgroups-java.git Package: libjgroups-java Architecture: all -Depends: ${misc:Depends} -Suggests: libbcprov-java +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends} Description: Toolkit for Reliable Multicast Communication JGroups is a toolkit for reliable multicast communication. (Note that this doesn't necessarily mean IP Multicast, JGroups can also use diff --git a/debian/libjgroups-java.poms b/debian/libjgroups-java.poms new file mode 100644 index 0000000..433f4e1 --- /dev/null +++ b/debian/libjgroups-java.poms @@ -0,0 +1 @@ +pom.xml --has-package-version --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..32e01be --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1 @@ +org.apache.maven.plugins maven-source-plugin diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..c04f18f --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1 @@ +s/bsh/org.beanshell/ bsh * s/.*/debian/ * * diff --git a/debian/rules b/debian/rules index 6dad65d..c44488e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,23 +1,7 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -JAVA_HOME := /usr/lib/jvm/default-java -ANT_OPTS := -Xmx128M -DEB_ANT_BUILD_TARGET := jar -#does no longer work with 2.7.0 -#DEB_ANT_CHECK_TARGET := -Djgroups.bind_addr=`hostname` all-tests -DEB_JARS := xalan2 serializer junit log4j-1.2 bsh commons-logging ant-junit testng -ANT_OPTS := -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 - -install/libjgroups-java:: - mh_installpom -plibjgroups-java pom.xml - mh_installjar -plibjgroups-java pom.xml -l dist/jgroups-2.12.2.Final.jar +%: + dh $@ --buildsystem=maven get-orig-source: - uscan --debug --download-version `echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\./_/g'` --force-download --rename - -clean:: - mh_clean - rm -f build.properties + uscan --debug --download-curent-version --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjgroups-java.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