[uima-as] 01/04: 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 uima-as.

commit 90886d3cd9efab2cfe94da920d176dcd8429eacd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 13 00:42:51 2017 +0100

    Depend on the Geronimo spec jars instead of glassfish-javaee
---
 debian/changelog   | 7 +++++++
 debian/control     | 4 +++-
 debian/maven.rules | 4 ----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec9d0f3..a1056f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+uima-as (2.3.1-8) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on the Geronimo spec jars instead of glassfish-javaee
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 13 Dec 2017 00:38:57 +0100
+
 uima-as (2.3.1-7) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index e70fd7a..73ff281 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends:
  debhelper (>= 10),
  default-jdk,
  junit4,
- glassfish-javaee,
  libactivemq-java,
  libactivemq-protobuf-java,
  libbuild-helper-maven-plugin-java,
@@ -22,6 +21,9 @@ Build-Depends:
  libcommons-net-java,
  libcommons-pool-java,
  libcommons-pool-java-doc,
+ libgeronimo-j2ee-connector-1.5-spec-java,
+ libgeronimo-j2ee-management-1.1-spec-java,
+ libgeronimo-jms-1.1-spec-java,
  libmaven-antrun-plugin-java,
  libmaven-bundle-plugin-java,
  libmaven-dependency-plugin-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 19f21a4..10a48ae 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -27,7 +27,3 @@ commons-httpclient commons-httpclient jar s/.*/3.x/ * *
 log4j log4j jar s/.*/1.2.x/ * *
 commons-collections commons-collections jar s/.*/3.x/ * *
 s/org.apache.geronimo.specs/javax.servlet/ s/geronimo-servlet_2.5_spec/javax.servlet-api/ jar s/.*/3.1/ * *
-s/org.apache.geronimo.specs/javax.jms/ s/geronimo-jms_1.1_spec/jms/ jar s/.*/debian/ * *
-
-s/org.apache.geronimo.specs/javax/ s/geronimo-j2ee-management_1.1_spec/javaee-api/ jar s/.*/debian/ * *
-s/org.apache.geronimo.specs/javax/ s/geronimo-j2ee-connector_1.5_spec/javaee-api/ jar s/.*/debian/ * *

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