[lucene-solr] 01/04: Removed the dependency on libgeronimo-stax-1.2-spec-java

[Emmanuel Bourg]

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

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

commit 7e1bb4d331c9a17b1ff6fd87cc5d6684066a8e34
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 13 10:20:20 2015 +0200

    Removed the dependency on libgeronimo-stax-1.2-spec-java
---
 debian/build-jars        | 1 -
 debian/changelog         | 7 +++++++
 debian/control           | 2 --
 debian/maven.ignoreRules | 2 ++
 debian/maven.rules       | 1 -
 debian/solr-common.links | 1 -
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/build-jars b/debian/build-jars
index a7a2845..6513eda 100644
--- a/debian/build-jars
+++ b/debian/build-jars
@@ -19,7 +19,6 @@
 /usr/share/java/commons-io.jar:./solr/lib/commons-io.jar
 /usr/share/java/commons-lang.jar:./solr/lib/commons-lang.jar
 /usr/share/java/easymock.jar:./solr/lib/easymock.jar
-/usr/share/java/geronimo-stax-1.2-spec.jar:./solr/lib/geronimo-stax-1.2-spec.jar
 /usr/share/java/guava.jar:./solr/lib/guava.jar
 /usr/share/java/httpclient.jar:./solr/lib/httpclient.jar
 /usr/share/java/httpcore.jar:./solr/lib/httpcore.jar
diff --git a/debian/changelog b/debian/changelog
index 8f2431f..fb4578a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lucene-solr (3.6.2+dfsg-7) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed the dependency on libgeronimo-stax-1.2-spec-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 13 Jul 2015 10:19:53 +0200
+
 lucene-solr (3.6.2+dfsg-6) UNRELEASED; urgency=medium
 
   [ Emmanuel Bourg ]
diff --git a/debian/control b/debian/control
index 53c0d15..590b358 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Build-Depends:
  libcommons-logging-java,
  libeasymock-java,
  libexcalibur-logkit-java,
- libgeronimo-stax-1.2-spec-java,
  libguava-java,
  libhttpclient-java (>= 4.1.1),
  libhttpmime-java,
@@ -106,7 +105,6 @@ Depends:
  libcommons-io-java (>= 1.4),
  libcommons-lang-java,
  libcommons-logging-java,
- libgeronimo-stax-1.2-spec-java,
  libguava-java,
  libhttpclient-java (>= 4.1.1),
  libhttpmime-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 43cf469..58f2cea 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -23,3 +23,5 @@ org.apache.tika     *          * * * *
 org.apache.uima     *          * * * *
 org.apache.velocity *          * * * *
 org.carrot2         *          * * * *
+
+org.apache.geronimo.specs geronimo-stax-api_1.0_spec
diff --git a/debian/maven.rules b/debian/maven.rules
index 9be585e..a103bb2 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,7 +17,6 @@
 #   junit junit jar s/3\\..*/3.x/
 
 commons-httpclient         commons-httpclient                                         * s/3\..*/3.x/ * *
-org.apache.geronimo.specs  s/geronimo-stax-api_1.0_spec/geronimo-activation_1.1_spec/ * s/.*/debian/ * *
 org.codehaus.woodstox      s/wstx-asl/woodstox-core-lgpl/                             * s/.*/debian/ * *
 javax.servlet              servlet-api                                                * s/.*/3.0/ * *
 junit                      junit                                                      * s/4\..*/4.x/ * *
diff --git a/debian/solr-common.links b/debian/solr-common.links
index 9ca3282..9bce3ef 100644
--- a/debian/solr-common.links
+++ b/debian/solr-common.links
@@ -14,7 +14,6 @@
 /usr/share/java/commons-io.jar              /usr/share/solr/web/WEB-INF/lib/commons-io.jar
 /usr/share/java/commons-lang.jar            /usr/share/solr/web/WEB-INF/lib/commons-lang.jar
 /usr/share/java/commons-logging.jar         /usr/share/solr/web/WEB-INF/lib/commons-logging.jar
-/usr/share/java/geronimo-stax-1.2-spec.jar  /usr/share/solr/web/WEB-INF/lib/geronimo-stax-1.2-spec.jar
 /usr/share/java/guava.jar                   /usr/share/solr/web/WEB-INF/lib/guava.jar
 /usr/share/java/httpcore.jar                /usr/share/solr/web/WEB-INF/lib/httpcore.jar
 /usr/share/java/httpclient.jar              /usr/share/solr/web/WEB-INF/lib/httpclient.jar

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