[Git][java-team/libxstream-java][master] 5 commits: Standards-Version updated to 4.5.0

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libxstream-java


Commits:
b1251770 by Emmanuel Bourg at 2020-04-05T22:35:36+02:00
Standards-Version updated to 4.5.0

- - - - -
da78d971 by Emmanuel Bourg at 2020-04-05T22:35:44+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
cdb11064 by Emmanuel Bourg at 2020-04-05T23:03:43+02:00
Removed the dependency on libstax-java

- - - - -
cbf27e22 by Emmanuel Bourg at 2020-04-05T23:08:02+02:00
Removed the get-orig-source target

- - - - -
efd1c08d by Emmanuel Bourg at 2020-04-05T23:08:27+02:00
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/maven.ignoreRules
- + debian/patches/02-disable-beastax-driver.patch
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libxstream-java (1.4.11.1-2) unstable; urgency=medium
+
+  * Removed the dependency on libstax-java
+  * Standards-Version updated to 4.5.0
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 05 Apr 2020 23:08:19 +0200
+
 libxstream-java (1.4.11.1-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -20,15 +20,14 @@ Build-Depends:
  libjoda-time-java,
  libkxml2-java,
  libmaven-bundle-plugin-java,
- libstax-java,
  libstax2-api-java,
  libwoodstox-java,
  libxom-java,
  libxpp3-java,
  maven-debian-helper
-Standards-Version: 4.2.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libxstream-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libxstream-java.git
+Standards-Version: 4.5.0
+Vcs-Git: https://salsa.debian.org/java-team/libxstream-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libxstream-java
 Homepage: http://x-stream.github.io
 
 Package: libxstream-java


=====================================
debian/maven.ignoreRules
=====================================
@@ -36,3 +36,6 @@ org.codehaus.mojo jxr-maven-plugin * * * *
 org.json json * * * *
 oro oro * * * *
 xmlpull xmlpull * * * *
+
+stax stax
+stax stax-api


=====================================
debian/patches/02-disable-beastax-driver.patch
=====================================
@@ -0,0 +1,31 @@
+Description: Removes the dependency on the com.bea.xml.stream package (not needed, allows us to drop the StAX dependency)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java
++++ b/xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java
+@@ -10,8 +10,6 @@
+  */
+ package com.thoughtworks.xstream.io.xml;
+ 
+-import com.bea.xml.stream.MXParserFactory;
+-import com.bea.xml.stream.XMLOutputFactoryBase;
+ import com.thoughtworks.xstream.io.naming.NameCoder;
+ 
+ import javax.xml.stream.XMLInputFactory;
+@@ -71,16 +69,4 @@
+         super(nameCoder);
+     }
+ 
+-    protected XMLInputFactory createInputFactory() {
+-        final XMLInputFactory instance = new MXParserFactory();
+-        instance.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
+-//        if (instance.isPropertySupported(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES))
+-//            throw new IllegalStateException("Should not support external entities now!");
+-        return instance;
+-    }
+-
+-    protected XMLOutputFactory createOutputFactory() {
+-        return new XMLOutputFactoryBase();
+-    }
+-
+ }


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 01-java7-compatibility.patch
+02-disable-beastax-driver.patch


=====================================
debian/rules
=====================================
@@ -2,6 +2,3 @@
 
 %:
 	dh $@ --with javahelper
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename --repack --compression xz


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
-opts=uversionmangle=s/_/./g \
+version=4
+opts="repack,compression=xz,uversionmangle=s/_/./g" \
 https://github.com/x-stream/xstream/tags .*/archive/XSTREAM_([\d_]+).tar.gz



View it on GitLab: https://salsa.debian.org/java-team/libxstream-java/-/compare/f3149c2d4a5647042d49710ee0e413324d0b3e63...efd1c08df43e4e5ea52f439de5847708c4387c80

-- 
View it on GitLab: https://salsa.debian.org/java-team/libxstream-java/-/compare/f3149c2d4a5647042d49710ee0e413324d0b3e63...efd1c08df43e4e5ea52f439de5847708c4387c80
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200405/cd267f33/attachment.html>