[activemq] 06/07: Depend on the Geronimo spec jars instead of glassfish-javaee

[Emmanuel Bourg]

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

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

commit 8b2137bcd80c43e8a9318d916f290580ddc9d16b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 12 10:03:42 2017 +0100

    Depend on the Geronimo spec jars instead of glassfish-javaee
---
 debian/activemq.links    | 6 +++++-
 debian/changelog         | 1 +
 debian/control           | 6 +++++-
 debian/maven.ignoreRules | 9 ++-------
 debian/maven.rules       | 8 ++------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/activemq.links b/debian/activemq.links
index 271e1e4..fd8111c 100644
--- a/debian/activemq.links
+++ b/debian/activemq.links
@@ -19,7 +19,11 @@
 /usr/share/java/commons-lang.jar         /usr/share/activemq/lib/optional/commons-lang.jar
 /usr/share/java/commons-net.jar          /usr/share/activemq/lib/optional/commons-net.jar
 /usr/share/java/commons-pool2.jar        /usr/share/activemq/lib/optional/commons-pool2jar
-/usr/share/java/glassfish-javaee.jar      /usr/share/activemq/lib/glassfish-javaee.jar
+/usr/share/java/geronimo-j2ee-connector-1.5-spec.jar  /usr/share/activemq/lib/geronimo-j2ee-connector-1.5-spec.jar
+/usr/share/java/geronimo-j2ee-management-1.1-spec.jar /usr/share/activemq/lib/geronimo-j2ee-management-1.1-spec.jar
+/usr/share/java/geronimo-jacc_1.1_spec.jar            /usr/share/activemq/lib/geronimo-jacc_1.1_spec.jar
+/usr/share/java/geronimo-jms_1.1_spec.jar             /usr/share/activemq/lib/geronimo-jms_1.1_spec.jar
+/usr/share/java/geronimo-jta-1.2-spec.jar             /usr/share/activemq/lib/geronimo-jta-1.2-spec.jar
 /usr/share/java/hawtbuf.jar               /usr/share/activemq/lib/hawtbuf.jar
 /usr/share/java/jackson-annotations.jar   /usr/share/activemq/lib/jackson-annotations.jar
 /usr/share/java/jackson-core.jar          /usr/share/activemq/lib/jackson-core.jar
diff --git a/debian/changelog b/debian/changelog
index 25d3cd2..e5424ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ activemq (5.15.2-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+  * Depend on the Geronimo spec jars instead of glassfish-javaee
   * Removed the unused build dependency on libmaven-enforcer-plugin-java
   * Simplified the Maven rules
   * Standards-Version updated to 4.1.2
diff --git a/debian/control b/debian/control
index 9b451d7..e79410c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends:
  ant,
  debhelper (>= 10),
  default-jdk,
- glassfish-javaee,
  junit4,
  libactivemq-activeio-java,
  libactivemq-protobuf-java,
@@ -27,6 +26,11 @@ Build-Depends:
  libderby-java,
  libgentlyweb-utils-java,
  libgentlyweb-utils-java-doc,
+ libgeronimo-j2ee-connector-1.5-spec-java,
+ libgeronimo-j2ee-management-1.1-spec-java,
+ libgeronimo-jacc-1.1-spec-java,
+ libgeronimo-jms-1.1-spec-java,
+ libgeronimo-jta-1.2-spec-java,
  libhawtbuf-java,
  libhawtdispatch-java,
  libhttpclient-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 6d8f021..685827e 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -30,6 +30,8 @@ org.apache.activemq activemq-unit-tests * * * *
 org.apache.camel camel-core * * * *
 org.apache.directory.server apacheds-core-integ * * * *
 org.apache.directory.server apacheds-server-integ * * * *
+org.apache.geronimo.components geronimo-transaction * * * *
+org.apache.geronimo.specs geronimo-annotation_1.0_spec * * * *
 org.apache.maven.plugins maven-antrun-plugin * * * *
 org.apache.maven.plugins maven-eclipse-plugin * * * *
 org.apache.maven.plugins maven-surefire-plugin * * * *
@@ -50,10 +52,3 @@ org.linkedin * * * *
 org.jencks * * * *
 org.springframework.osgi * * * *
 org.eclipse.jetty.aggregate jetty-all * * * *
-
-# Replaced by glassfish-j2ee
-org.apache.geronimo.specs geronimo-jta_1.0.1B_spec * * * *
-org.apache.geronimo.specs geronimo-j2ee-management_1.1_spec * * * *
-org.apache.geronimo.specs geronimo-annotation_1.0_spec * * * *
-org.apache.geronimo.specs geronimo-jacc_1.1_spec * * * *
-org.apache.geronimo.components geronimo-transaction * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 8a098c2..120d01f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -11,12 +11,8 @@ org.apache.tomcat tomcat-jsp-api * s/.*/8.x/ * *
 org.apache.tomcat tomcat-servlet-api * s/.*/8.x/ * *
 org.apache.tomcat tomcat-websocket-api * s/.*/8.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
-s/org.apache.geronimo.specs/javax/ s/geronimo-jms_1.1_spec/javaee-api/ jar s/.*/5.0/ * *
-s/org.apache.geronimo.specs/javax/ s/geronimo-jta_1.0.1B_spec/javaee-api/ jar s/.*/5.0/ * *
-s/org.apache.geronimo.specs/javax/ s/geronimo-jacc_1.1_spec/javaee-api/ jar s/.*/5.0/ * *
-s/org.apache.geronimo.specs/javax/ s/geronimo-j2ee-connector_1.5_spec/javaee-api/ jar s/.*/5.0/ * *
-s/org.apache.geronimo.specs/javax/ s/geronimo-servlet_2.5_spec/javaee-api/ jar s/.*/5.0/ * *
-s/org.apache.geronimo.components/javax/ s/geronimo-transaction/javaee-api/ jar s/.*/5.0/ * *
+org.apache.geronimo.specs s/geronimo-jta_1.0.1B_spec/geronimo-jta_1.2_spec/ * s/.*/debian/ * *
+s/org.apache.geronimo.specs/javax.servlet/ s/geronimo-servlet_2.5_spec/javax.servlet-api/ jar s/.*/3.1/ * *
 com.fasterxml.jackson.core jackson-databind * s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-core * s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-annotations * s/2\..*/2.x/ * *

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