[Git][java-team/resteasy][master-3.0] 3 commits: control, jaxb-api-compatibility.diff: Fix build, add libjaxb-api-java to…

[Timo Aaltonen]

Timo Aaltonen pushed to branch master-3.0 at Debian Java Maintainers / resteasy


Commits:
7b849ed7 by Timo Aaltonen at 2018-12-04T11:49:22Z
control, jaxb-api-compatibility.diff: Fix build, add libjaxb-api-java to build-depends. (Closes: #912395)

- - - - -
1608a5b7 by Timo Aaltonen at 2018-12-04T12:12:42Z
Enable jackson2 provider.

- - - - -
18ed5f41 by Timo Aaltonen at 2018-12-04T12:13:07Z
releasing package resteasy3.0 version 3.0.19-5

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/libresteasy3.0-java.classpath
- debian/libresteasy3.0-java.poms
- debian/maven.rules
- + debian/patches/jaxb-api-compatibility.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+resteasy3.0 (3.0.19-5) unstable; urgency=medium
+
+  * control, jaxb-api-compatibility.diff: Fix build, add libjaxb-api-java to
+    build-depends. (Closes: #912395)
+  * Enable jackson2 provider.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Tue, 04 Dec 2018 14:13:02 +0200
+
 resteasy3.0 (3.0.19-4) unstable; urgency=medium
 
   * classpath: Updated, drop slf4j-simple.jar, fix snakeyml and annotations-api


=====================================
debian/control
=====================================
@@ -10,7 +10,12 @@ Build-Depends-Indep:
  libcommons-io-java,
  libhttpclient-java,
  libjackson-json-java,
+ libjackson2-core-java,
+ libjackson2-databind-java,
+ libjackson2-jaxrs-providers-java,
+ libjackson2-module-jaxb-annotations-java,
  libjaxb-java,
+ libjaxb-api-java,
  libjaxrs-api-java (>= 2.1),
  libjboss-logging-java,
  libjboss-logging-tools-java,


=====================================
debian/libresteasy3.0-java.classpath
=====================================
@@ -2,5 +2,6 @@ usr/share/java/resteasy-jaxrs.jar	/usr/share/java/log4j-1.2.jar /usr/share/java/
 usr/share/java/resteasy-jaxb-provider.jar	/usr/share/java/jaxb-impl.jar
 usr/share/java/resteasy-jettison-provider.jar	/usr/share/java/jettison.jar
 usr/share/java/resteasy-jackson-provider.jar	/usr/share/java/jackson-core-asl.jar /usr/share/java/jackson-mapper-asl.jar /usr/share/java/jackson-jaxrs.jar /usr/share/java/jackson-xc.jar
+usr/share/java/resteasy-jackson2-provider.jar	/usr/share/java/jackson-core.jar /usr/share/java/jackson-databind.jar /usr/share/java/jackson-jaxrs-base.jar /usr/share/java/jackson-jaxrs-json-provider.jar /usr/share/java/jackson-module-jaxb-annotations.jar
 usr/share/java/resteasy-atom-provider.jar	/usr/share/java/jaxb-impl.jar
 usr/share/java/resteasy-yaml-provider.jar	/usr/share/java/snakeyaml.jar


=====================================
debian/libresteasy3.0-java.poms
=====================================
@@ -38,7 +38,7 @@ jaxrs/providers/fastinfoset/pom.xml --ignore
 jaxrs/providers/jaxb/pom.xml --has-package-version
 jaxrs/providers/jettison/pom.xml --has-package-version
 jaxrs/providers/jackson/pom.xml --has-package-version
-jaxrs/providers/jackson2/pom.xml --ignore
+jaxrs/providers/jackson2/pom.xml --has-package-version
 jaxrs/providers/json-p-ee7/pom.xml --ignore
 jaxrs/providers/multipart/pom.xml --ignore
 jaxrs/providers/resteasy-atom/pom.xml --has-package-version


=====================================
debian/maven.rules
=====================================
@@ -3,6 +3,9 @@ s/msv-msv/net.java.dev.msv/ s/msv-msv/msv/ jar debian * *
 com.fasterxml.jackson.core jackson-annotations jar s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-core jar s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind jar s/2\..*/2.x/ * *
+com.fasterxml.jackson.jaxrs jackson-jaxrs-base * s/.*/2.x/ * *
+com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider * s/.*/2.x/ * *
+com.fasterxml.jackson.module jackson-module-jaxb-annotations * s/.*/2.x/ * *
 junit junit jar s/4\..*/4.x/ * *
 org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * *
 org.yaml snakeyaml * s/.*/1.x/ * *


=====================================
debian/patches/jaxb-api-compatibility.diff
=====================================
@@ -0,0 +1,14 @@
+--- a/jaxrs/resteasy-jaxrs/pom.xml
++++ b/jaxrs/resteasy-jaxrs/pom.xml
+@@ -133,6 +133,11 @@
+             <scope>provided</scope>
+             <optional>true</optional>
+         </dependency>
++	<dependency>
++         <groupId>javax.xml.bind</groupId>
++         <artifactId>jaxb-api</artifactId>
++         <version>2.3.0</version>
++       </dependency>
+     </dependencies>
+     
+     <build>


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 01-ignore-tjws.patch
 02-servlet-api-compatibility.patch
 03-jaxrs-api-compatibility.patch
+jaxb-api-compatibility.diff



View it on GitLab: https://salsa.debian.org/java-team/resteasy/compare/15d337db2b0530f70d7f0e7bbe90c8df81cef75a...18ed5f410e16deb9c1db96105e6601e4f9e611b2

-- 
View it on GitLab: https://salsa.debian.org/java-team/resteasy/compare/15d337db2b0530f70d7f0e7bbe90c8df81cef75a...18ed5f410e16deb9c1db96105e6601e4f9e611b2
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/20181204/92917368/attachment.html>