[maven-repo-helper] 01/04: Removed the dependency on libstax-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 maven-repo-helper.

commit 91d18424ffd4ee4928a562093d29b39f2d92e027
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 23 19:47:40 2017 +0200

    Removed the dependency on libstax-java
---
 debian/changelog                        | 5 +++++
 debian/control                          | 4 ++--
 debian/rules                            | 5 ++---
 src/main/resources/META-INF/MANIFEST.MF | 2 +-
 src/main/share/mh_lib.sh                | 3 +--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b75212d..345c385 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 maven-repo-helper (1.9.3) UNRELEASED; urgency=medium
 
   * Team upload.
+
+  [ tony mancill ]
   * Apply patch for mh_patchpoms to honor the --verbose option.
     Thank you to Christopher Hoskin for the patch. (Closes: #835042)
 
+  [ Emmanuel Bourg ]
+  * Removed the dependency on libstax-java
+
  -- tony mancill <tmancill at debian.org>  Tue, 23 Aug 2016 22:26:59 -0700
 
 maven-repo-helper (1.9.2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 0527bfd..c1cfa2e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Damien Raude-Morvan <drazzib at debian.org>,
  Thomas Koch <thomas at koch.ro>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, help2man, python-docutils
-Build-Depends-Indep: ant-optional, libstax-java, junit4, libxmlunit-java, libcommons-io-java
+Build-Depends-Indep: ant-optional, junit4, libxmlunit-java, libcommons-io-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-repo-helper.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-repo-helper.git
@@ -13,7 +13,7 @@ Homepage: http://wiki.debian.org/Java/MavenRepoSpec
 
 Package: maven-repo-helper
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libstax-java
+Depends: ${misc:Depends}, default-jre-headless (>= 1:1.6) | java6-runtime-headless
 Recommends: debhelper
 Suggests: maven-debian-helper
 Breaks: maven-debian-helper (<= 1.6.6)
diff --git a/debian/rules b/debian/rules
index 460916c..7d37cbc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,11 @@ include /usr/share/cdbs/1/class/ant.mk
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-junit stax-api xml-apis junit4 ant-junit4
+DEB_JARS             := ant-junit junit4 ant-junit4
 DEB_ANT_BUILD_TARGET := package
 DEB_ANT_BUILDFILE    := ./debian/build.xml
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-CLASSPATH            := /usr/share/java/ant-junit.jar:/usr/share/java/stax-api.jar:/usr/share/java/stax.jar:/usr/share/java/xml-apis.jar
-JAVA_OPTIONS         := -Djavax.xml.stream.XMLOutputFactory=com.bea.xml.stream.XMLOutputFactoryBase
+CLASSPATH            := /usr/share/java/ant-junit.jar
 
 # Generation of man pages
 SCRIPTS       := $(wildcard src/main/bin/mh_*)
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
index f14b168..5e94951 100644
--- a/src/main/resources/META-INF/MANIFEST.MF
+++ b/src/main/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Class-Path: stax.jar
+Class-Path: 
 
diff --git a/src/main/share/mh_lib.sh b/src/main/share/mh_lib.sh
index 4cb5a0d..c7c047c 100644
--- a/src/main/share/mh_lib.sh
+++ b/src/main/share/mh_lib.sh
@@ -5,8 +5,7 @@
 #
 
 MH_VERSION=${MH_VERSION:-1.7.1}
-CLASSPATH=/usr/share/java/stax-api.jar:/usr/share/java/stax.jar:/usr/share/java/xml-apis.jar:/usr/share/java/maven-repo-helper.jar
-JAVA_OPTIONS="-Djavax.xml.stream.XMLOutputFactory=com.bea.xml.stream.XMLOutputFactoryBase -Djavax.xml.stream.XMLInputFactory=com.bea.xml.stream.MXParserFactory"
+CLASSPATH=/usr/share/java/maven-repo-helper.jar
 
 parseargs()
 {

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