This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libhibernate3-java.
commit 2ded8fcb04a68ad1ed1bf5fb65b47f685960fcd5 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 7 20:20:23 2016 +0200 Build with maven-debian-helper instead of CDBS --- debian/build.xml | 75 ---------------------------------------- debian/changelog | 1 + debian/control | 3 +- debian/log4j-1.2.x.pom | 79 ------------------------------------------- debian/maven.cleanIgnoreRules | 15 -------- debian/maven.publishedRules | 18 ---------- debian/rules | 42 ++++++++++++++--------- 7 files changed, 28 insertions(+), 205 deletions(-) diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index 3ce4c85..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project default="jar" name="${project.name}" basedir=".."> - - <patternset id="compiler.resources"> - <include name="**/?*.properties" /> - <include name="**/?*.xml" /> - <include name="**/?*.gif" /> - <include name="**/?*.png" /> - <include name="**/?*.jpeg" /> - <include name="**/?*.jpg" /> - <include name="**/?*.html" /> - <include name="**/?*.dtd" /> - <include name="**/?*.tld" /> - <include name="**/?*.ttf" /> - </patternset> - - <target name="clean"> - <delete dir="${class.dir}" quiet="true"/> - </target> - - <target name="generate" description="Generate ANTLR parsers."> - <taskdef name="antlrtask" - classname="org.apache.tools.ant.taskdefs.optional.ANTLR"> - </taskdef> - <mkdir dir="${core.source.dir}/${generate.dir}" /> - <antlrtask target="${antlr.dir}/hql.g" outputdirectory="${core.source.dir}/${generate.dir}" /> - <antlrtask target="${antlr.dir}/hql-sql.g" outputdirectory="${core.source.dir}/${generate.dir}" /> - <antlrtask target="${antlr.dir}/sql-gen.g" outputdirectory="${core.source.dir}/${generate.dir}" /> - </target> - - <target name="compile" description="o Compile the source files" depends="generate"> - <mkdir dir="${class.dir}"/> - - <javac srcdir="${core.source.dir}" destdir="${class.dir}" - debug="true" source="1.5" nowarn="true"/> - - <javac srcdir="${ehcache.source.dir}" destdir="${class.dir}" - debug="true" nowarn="true" source="1.5"/> - <javac srcdir="${jbosscache.source.dir}" destdir="${class.dir}" - debug="true" nowarn="true" source="1.5" classpath="/usr/share/java/jboss-cache1.jar"/> - <javac srcdir="${jbosscache2.source.dir}" destdir="${class.dir}" - debug="true" nowarn="true" source="1.5" classpath="/usr/share/java/jboss-cache2.jar"/> - <javac srcdir="${oscache.source.dir}" destdir="${class.dir}" - debug="true" nowarn="true" source="1.5"/> - <javac srcdir="${swarmcache.source.dir}" destdir="${class.dir}" - debug="true" nowarn="true" source="1.5"/> - <javac srcdir="${c3p0.source.dir}" destdir="${class.dir}" - debug="true" nowarn="true" source="1.5"/> - <javac srcdir="${proxool.source.dir}" destdir="${class.dir}" - debug="true" nowarn="true" source="1.5"/> - <javac srcdir="${jmx.source.dir}" destdir="${class.dir}" - debug="true" nowarn="true" source="1.5"/> - <copy todir="${class.dir}"> - <fileset dir="${resources.dir}"> - <patternset refid="compiler.resources" /> - </fileset> - </copy> - </target> - - <target name="jar" description="o Create the jar" depends="compile"> - <jar jarfile="${jar}"> - <fileset dir="${class.dir}"> - <include name="**"/> - </fileset> - </jar> - </target> - - <target name="javadoc" description="Creates Javadoc documentation"> - <mkdir dir="${doc.dir}" /> - <javadoc packagenames="org.hibernate.*" sourcepath="${core.source.dir}" - destdir="${doc.dir}" encoding="iso8859-1" /> - </target> - -</project> diff --git a/debian/changelog b/debian/changelog index ec94d7b..2a4e274 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libhibernate3-java (3.6.10.Final-5) UNRELEASED; urgency=medium * Team upload. * Added the missing libantlr-java dependency (Closes: #829388) * Depend on libcglib-java instead of libcglib3-java + * Build with maven-debian-helper instead of CDBS * Standards-Version updated to 3.9.8 * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index 1a84ec1..db52aee 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Uploaders: Emmanuel Bourg <[email protected]> Build-Depends: ant, - cdbs, debhelper (>= 9), default-jdk, glassfish-javaee, @@ -37,7 +36,7 @@ Build-Depends: liboscache-java, libproxool-java, libswarmcache-java, - maven-debian-helper (>= 1.6.3) + maven-debian-helper (>= 2.0) Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libhibernate3-java.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libhibernate3-java.git diff --git a/debian/log4j-1.2.x.pom b/debian/log4j-1.2.x.pom deleted file mode 100644 index ca1664d..0000000 --- a/debian/log4j-1.2.x.pom +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<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>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.x</version> - <packaging>bundle</packaging> - <properties> - <debian.originalVersion>1.2.16</debian.originalVersion> - <debian.package>liblog4j1.2-java</debian.package> - <debian.javax.mail.mail.originalVersion>1.4.1</debian.javax.mail.mail.originalVersion> - <debian.junit.junit.originalVersion>3.8.2</debian.junit.junit.originalVersion> - <debian.org.apache.geronimo.specs.geronimo-jms_1.1_spec.originalVersion>1.0</debian.org.apache.geronimo.specs.geronimo-jms_1.1_spec.originalVersion> - <debian.oro.oro.originalVersion>2.0.8</debian.oro.oro.originalVersion> - </properties> - - <name>Apache Log4j</name> - <description>Apache Log4j 1.2</description> - <url>http://logging.apache.org/log4j/1.2/</url> - <issueManagement> - <system>Bugzilla</system> - <url>http://issues.apache.org/bugzilla/</url> - </issueManagement> - <inceptionYear>1999</inceptionYear> - <mailingLists> - <mailingList> - <name>log4j-user</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - <archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-user/</archive> - <otherArchives> - <otherArchive>http://marc.info/?l=log4j-user</otherArchive> - <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.user</otherArchive> - </otherArchives> - </mailingList> - <mailingList> - <name>log4j-dev</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - <archive>http://mail-archives.apache.org/mod_mbox/logging-log4j-dev/</archive> - <otherArchives> - <otherArchive>http://marc.info/?l=log4j-dev</otherArchive> - <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.devel</otherArchive> - </otherArchives> - </mailingList> - </mailingLists> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_16</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/tags/v1_2_16</developerConnection> - <url>http://svn.apache.org/viewvc/logging/log4j/tags/v1_2_16</url> - </scm> - <organization> - <name>Apache Software Foundation</name> - <url>http://www.apache.org</url> - </organization> - <dependencies> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>debian</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>debian</version> - <optional>true</optional> - </dependency> - </dependencies> -</project> diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules deleted file mode 100644 index dbd3164..0000000 --- a/debian/maven.cleanIgnoreRules +++ /dev/null @@ -1,15 +0,0 @@ -# Maven clean ignore rules - ignore some Maven dependencies and plugins during the clean phase -# Format of this file is: -# [group] [artifact] [type] [version] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., this dependency is then removed -# from the POM -# junit junit jar s/3\..*/3.x/ diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules deleted file mode 100644 index fdca377..0000000 --- a/debian/maven.publishedRules +++ /dev/null @@ -1,18 +0,0 @@ -# Maven published rules - additional rules to publish, to help -# the packaging work of Debian maintainers using mh_make -# Format of this file is: -# [group] [artifact] [type] [version] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# - a regular expression of the form s/match/replace/ -# in this case, elements that match are transformed using -# the regex rule. -# All elements much match before a rule can be applied -# Example rule: match any dependency whose group is ant, -# replacing it with org.apache.ant -# s/ant/org.apache.ant/ * * s/.*/debian/ diff --git a/debian/rules b/debian/rules index 4b85a1e..5236c44 100755 --- a/debian/rules +++ b/debian/rules @@ -1,23 +1,33 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +%: + dh $@ --buildsystem=maven -JAVA_HOME := /usr/lib/jvm/default-java -DEB_MAVEN_DOC_TARGET := javadoc:aggregate -DEB_BUILDDIR := $(CURDIR)/project +override_dh_auto_build: + rm -Rf debian/maven-repo/org/hibernate/hibernate + rm -Rf debian/maven-repo/org/hibernate/hibernate-parent + rm -Rf debian/maven-repo/org/hibernate/hibernate-core + rm -Rf debian/maven-repo/org/hibernate/hibernate-ehcache + rm -Rf debian/maven-repo/org/hibernate/hibernate-oscache + rm -Rf debian/maven-repo/org/hibernate/hibernate-jbosscache + rm -Rf debian/maven-repo/org/hibernate/hibernate-swarmcache + rm -Rf debian/maven-repo/org/hibernate/hibernate-proxool + rm -Rf debian/maven-repo/org/hibernate/hibernate-testing + rm -Rf debian/maven-repo/org/hibernate/hibernate-testsuite + rm -Rf debian/maven-repo/org/hibernate/hibernate-c3p0 + rm -Rf debian/maven-repo/org/hibernate/hibernate-entitymanager + rm -Rf debian/maven-repo/org/hibernate/hibernate-envers + rm -Rf debian/maven-repo/org/hibernate/hibernate-jdbc3-testing + rm -Rf debian/maven-repo/org/hibernate/hibernate-jdbc4-testing + rm -Rf debian/maven-repo/org/hibernate/hibernate-infinispan -# Avoid incremental builds when packaging a new upstream release by -# using the maven install target to ensure that artifacts are installed -ifeq ($(shell echo -n $(DEB_VERSION) | sed -sre 's/^.*-(.*)$$/\1/'),1) -ifneq ($(shell dpkg-query -W -f='$${Version}' $(DEB_SOURCE_PACKAGE)),\ - $(shell echo -n $(DEB_VERSION))) -DEB_MAVEN_BUILD_TARGET := install -endif -endif + dh_auto_build -- --file project/pom.xml package javadoc:aggregate -clean:: - -rm -rf debian/null mvn-build +override_dh_auto_test: + dh_auto_test -- --file project/pom.xml + +override_dh_auto_install: + dh_auto_install -- --file project/pom.xml get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + uscan --download-current-version --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libhibernate3-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
