This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libquartz2-java.
commit e9f825d3e79be0d353dc0c035222d8a04bfc7659 Author: Emmanuel Bourg <ebo...@apache.org> Date: Mon Dec 4 12:20:02 2017 +0100 Replaced the build dependency on glassfish-j2ee with the Geronimo spec jars --- debian/changelog | 1 + debian/control | 4 ++- debian/maven.ignoreRules | 1 + debian/maven.rules | 1 - debian/patches/01-j2ee-dependencies.patch | 60 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 66 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0cff08..b40121a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libquartz2-java (2.2.3-3) UNRELEASED; urgency=medium * Team upload. + * Replaced the build dependency on glassfish-j2ee with the Geronimo spec jars * Standards-Version updated to 4.1.2 -- Emmanuel Bourg <ebo...@apache.org> Mon, 04 Dec 2017 12:04:23 +0100 diff --git a/debian/control b/debian/control index 2bf03a3..12714c3 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Uploaders: Build-Depends: debhelper (>= 10), default-jdk, - glassfish-javaee, javahelper, junit4, libasm-java (>= 5.0), @@ -18,6 +17,9 @@ Build-Depends: libcommons-logging-java, libcommons-validator-java, libgeronimo-commonj-spec-java, + libgeronimo-ejb-3.2-spec-java, + libgeronimo-jms-1.1-spec-java, + libgeronimo-jta-1.2-spec-java, libhamcrest-java, libmail-java, libmaven-antrun-plugin-java, diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 0dcb7e1..430388c 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -20,6 +20,7 @@ org.apache.maven.plugins maven-deploy-plugin * * * * org.apache.maven.plugins maven-javadoc-plugin * * * * org.apache.maven.plugins maven-pmd-plugin * * * * org.apache.maven.plugins maven-source-plugin * * * * +org.apache.openejb javaee-api * * * * org.codehaus.gmaven gmaven-plugin * * * * org.codehaus.mojo findbugs-maven-plugin * * * * org.codehaus.mojo rmic-maven-plugin * * * * diff --git a/debian/maven.rules b/debian/maven.rules index 11f311b..f75d38c 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -21,6 +21,5 @@ s/asm/org.ow2.asm/ * * s/.*/debian/ * * junit s/junit-dep/junit jar s/4\..*/4.x/ * * log4j log4j jar s/.*/1.2.x/ * * javax.transaction s/jta/transaction-api/ jar s/.*/debian/ * * -s/org.apache.openejb/javax/ javaee-api jar s/.*/debian/ * * javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * * javax.mail s/mail/javax.mail-api/ * s/.*/debian/ * * diff --git a/debian/patches/01-j2ee-dependencies.patch b/debian/patches/01-j2ee-dependencies.patch new file mode 100644 index 0000000..8737bb0 --- /dev/null +++ b/debian/patches/01-j2ee-dependencies.patch @@ -0,0 +1,60 @@ +Description: Depend on the individual JEE spec jars instead of the big all in one artifact. +Author: Emmanuel Bourg <ebo...@apache.org> +Forwarded: not-needed +--- a/quartz-core/pom.xml ++++ b/quartz-core/pom.xml +@@ -37,6 +37,18 @@ + <version>5.0-2</version> + <scope>provided</scope> + </dependency> ++ <dependency> ++ <groupId>org.apache.geronimo.specs</groupId> ++ <artifactId>geronimo-jta_1.2_spec</artifactId> ++ <version>debian</version> ++ <scope>provided</scope> ++ </dependency> ++ <dependency> ++ <groupId>javax.servlet</groupId> ++ <artifactId>servlet-api</artifactId> ++ <version>3.1</version> ++ <scope>provided</scope> ++ </dependency> + + <!-- test dependencies --> + <dependency> +--- a/quartz-jobs/pom.xml ++++ b/quartz-jobs/pom.xml +@@ -25,6 +25,18 @@ + <version>6.0-5</version> + <scope>provided</scope> + </dependency> ++ <dependency> ++ <groupId>org.apache.geronimo.specs</groupId> ++ <artifactId>geronimo-ejb_3.2_spec</artifactId> ++ <version>debian</version> ++ <scope>provided</scope> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.geronimo.specs</groupId> ++ <artifactId>geronimo-jms_1.1_spec</artifactId> ++ <version>debian</version> ++ <scope>provided</scope> ++ </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> +--- a/quartz-plugins/pom.xml ++++ b/quartz-plugins/pom.xml +@@ -34,6 +34,12 @@ + <version>5.0-2</version> + <scope>provided</scope> + </dependency> ++ <dependency> ++ <groupId>org.apache.geronimo.specs</groupId> ++ <artifactId>geronimo-jta_1.2_spec</artifactId> ++ <version>debian</version> ++ <scope>provided</scope> ++ </dependency> + <!-- test dependencies --> + <dependency> + <groupId>org.slf4j</groupId> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..521d066 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-j2ee-dependencies.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libquartz2-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