[Git][java-team/jersey1][master] 3 commits: Fixed the build failure with librome-java >= 1.6

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jersey1


Commits:
e86e6b92 by Emmanuel Bourg at 2019-03-02T01:04:09Z
Fixed the build failure with librome-java >= 1.6

- - - - -
9442cd84 by Emmanuel Bourg at 2019-03-02T01:04:16Z
Standards-Version updated to 4.3.0

- - - - -
0d69a3fc by Emmanuel Bourg at 2019-03-02T01:04:29Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/maven.rules
- + debian/patches/04-rome-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jersey1 (1.19.3-6) unstable; urgency=medium
+
+  * Fixed the build failure with librome-java >= 1.6
+  * Standards-Version updated to 4.3.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 02 Mar 2019 02:04:24 +0100
+
 jersey1 (1.19.3-5) unstable; urgency=medium
 
   * Fixed the build failure with Java 11 (Closes: #905358)


=====================================
debian/control
=====================================
@@ -24,9 +24,9 @@ Build-Depends:
  libmail-java,
  libmaven-bundle-plugin-java,
  libosgi-core-java,
- librome-java,
+ librome-java (>= 1.6),
  maven-debian-helper (>= 1.5)
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/jersey1.git
 Vcs-Browser: https://salsa.debian.org/java-team/jersey1
 Homepage: https://jersey.java.net


=====================================
debian/maven.rules
=====================================
@@ -16,3 +16,4 @@ s/ant/org.apache.ant/ ant * s/.*/debian/ * *
 javax.servlet javax.servlet-api * s/.*/3.1/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
 s/javax.servlet/javax.servlet.jsp/ s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * *
+s/rome/com.rometools/ rome * s/.*/debian/ * *


=====================================
debian/patches/04-rome-compatibility.patch
=====================================
@@ -0,0 +1,73 @@
+Description: Fixes the compatibility with the version of Rome in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/jersey-atom/src/main/java/com/sun/jersey/atom/rome/impl/provider/entity/AtomEntryProvider.java
++++ b/jersey-atom/src/main/java/com/sun/jersey/atom/rome/impl/provider/entity/AtomEntryProvider.java
+@@ -42,11 +42,11 @@
+ 
+ import com.sun.jersey.atom.rome.impl.ImplMessages;
+ import com.sun.jersey.core.provider.AbstractMessageReaderWriterProvider;
+-import com.sun.syndication.feed.atom.Entry;
+-import com.sun.syndication.feed.atom.Feed;
+-import com.sun.syndication.io.FeedException;
+-import com.sun.syndication.io.WireFeedInput;
+-import com.sun.syndication.io.WireFeedOutput;
++import com.rometools.rome.feed.atom.Entry;
++import com.rometools.rome.feed.atom.Feed;
++import com.rometools.rome.io.FeedException;
++import com.rometools.rome.io.WireFeedInput;
++import com.rometools.rome.io.WireFeedOutput;
+ import java.io.IOException;
+ import java.io.InputStream;
+ import java.io.OutputStream;
+@@ -56,12 +56,12 @@
+ import java.util.List;
+ import javax.ws.rs.core.MediaType;
+ import javax.ws.rs.core.MultivaluedMap;
+-import org.jdom.Document;
+-import org.jdom.Element;
+-import org.jdom.JDOMException;
+-import org.jdom.input.SAXBuilder;
+-import org.jdom.output.Format;
+-import org.jdom.output.XMLOutputter;
++import org.jdom2.Document;
++import org.jdom2.Element;
++import org.jdom2.JDOMException;
++import org.jdom2.input.SAXBuilder;
++import org.jdom2.output.Format;
++import org.jdom2.output.XMLOutputter;
+ 
+ /**
+  *
+--- a/jersey-atom/src/main/java/com/sun/jersey/atom/rome/impl/provider/entity/AtomFeedProvider.java
++++ b/jersey-atom/src/main/java/com/sun/jersey/atom/rome/impl/provider/entity/AtomFeedProvider.java
+@@ -41,11 +41,11 @@
+ package com.sun.jersey.atom.rome.impl.provider.entity;
+ 
+ import com.sun.jersey.core.provider.AbstractMessageReaderWriterProvider;
+-import com.sun.syndication.feed.WireFeed;
+-import com.sun.syndication.feed.atom.Feed;
+-import com.sun.syndication.io.FeedException;
+-import com.sun.syndication.io.WireFeedInput;
+-import com.sun.syndication.io.WireFeedOutput;
++import com.rometools.rome.feed.WireFeed;
++import com.rometools.rome.feed.atom.Feed;
++import com.rometools.rome.io.FeedException;
++import com.rometools.rome.io.WireFeedInput;
++import com.rometools.rome.io.WireFeedOutput;
+ import com.sun.jersey.atom.rome.impl.ImplMessages;
+ import java.io.IOException;
+ import java.io.InputStream;
+@@ -55,9 +55,9 @@
+ import java.lang.reflect.Type;
+ import javax.ws.rs.core.MediaType;
+ import javax.ws.rs.core.MultivaluedMap;
+-import org.jdom.Document;
+-import org.jdom.output.Format;
+-import org.jdom.output.XMLOutputter;
++import org.jdom2.Document;
++import org.jdom2.output.Format;
++import org.jdom2.output.XMLOutputter;
+ 
+ /**
+  *


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 01-maven-istack-commons-plugin.patch
 02-disable-moxy-support.patch
 03-add-enterprise-dependencies.patch
+04-rome-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/jersey1/compare/93989732eee209ca81c7d472b9af2d6ab8e3b6a0...0d69a3fcf268ced71997c64a0ea077721eb0ea0c

-- 
View it on GitLab: https://salsa.debian.org/java-team/jersey1/compare/93989732eee209ca81c7d472b9af2d6ab8e3b6a0...0d69a3fcf268ced71997c64a0ea077721eb0ea0c
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/20190302/de05db7d/attachment.html>