[libquartz-java] 03/05: Replaced the build dependency on glassfish-j2ee with the Geronimo spec jars

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libquartz-java.

commit 602d03566666d164e78a910a05ee9832dadb5ab4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 4 11:27:54 2017 +0100

    Replaced the build dependency on glassfish-j2ee with the Geronimo spec jars
---
 debian/changelog                       |  1 +
 debian/control                         |  4 +++-
 debian/maven.ignoreRules               |  2 +-
 debian/maven.rules                     |  1 -
 debian/patches/j2ee-dependencies.patch | 42 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 6 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27a68a6..9f46a95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libquartz-java (1:1.8.6-4.1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
+  * Replaced the build dependency on glassfish-j2ee with the Geronimo spec jars
   * Standards-Version updated to 4.1.2
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 04 Dec 2017 11:03:37 +0100
diff --git a/debian/control b/debian/control
index b3bf1e0..3d743be 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends:
  debhelper (>= 10),
  default-jdk,
  default-jdk-doc,
- glassfish-javaee,
  javahelper,
  junit,
  libasm-java (>= 5.0),
@@ -21,6 +20,9 @@ Build-Depends:
  libcommons-logging-java-doc,
  libcommons-pool-java-doc,
  libcommons-validator-java,
+ libgeronimo-ejb-3.2-spec-java,
+ libgeronimo-jms-1.1-spec-java,
+ libgeronimo-jta-1.2-spec-java,
  libhamcrest-java,
  liblog4j1.2-java-doc,
  libmail-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 47a683c..b685265 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -21,4 +21,4 @@ org.apache.maven.plugins maven-source-plugin * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
 org.codehaus.mojo rmic-maven-plugin * * * *
 org.apache.derby derby * * * *
-
+org.apache.openejb javaee-api * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 0645ae3..d85ca2b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -24,6 +24,5 @@ javax.transaction s/jta/transaction-api/ jar s/.*/debian/ * *
 org.quartz-scheduler quartz-parent pom s/.*/debian/ * *
 org.quartz-scheduler quartz jar s/.*/debian/ * *
 log4j log4j * s/1\.2\..*/1.2.x/ * *
-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/j2ee-dependencies.patch b/debian/patches/j2ee-dependencies.patch
new file mode 100644
index 0000000..84d7737
--- /dev/null
+++ b/debian/patches/j2ee-dependencies.patch
@@ -0,0 +1,42 @@
+Description: Depend on the individual JEE spec jars instead of the big all in one artifact.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/quartz/pom.xml
++++ b/quartz/pom.xml
+@@ -13,6 +13,36 @@
+ 
+   <dependencies>
+     <dependency>
++      <groupId>javax.mail</groupId>
++      <artifactId>javax.mail-api</artifactId>
++      <version>debian</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>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>
++    <dependency>
+       <groupId>org.apache.openejb</groupId>
+       <artifactId>javaee-api</artifactId>
+       <version>5.0-2</version>
diff --git a/debian/patches/series b/debian/patches/series
index a8c7049..c8ecdb3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable_update_check_864769.patch
+j2ee-dependencies.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libquartz-java.git