Emmanuel Bourg pushed to branch master at Debian Java Maintainers / istack-commons
Commits: 08863cca by Emmanuel Bourg at 2018-11-02T10:16:37Z Standards-Version updated to 4.2.1 - - - - - 459b2339 by Emmanuel Bourg at 2018-11-02T11:01:35Z Fixed the build failure with Java 11 (Closes: #912455) - - - - - a2b6f980 by Emmanuel Bourg at 2018-11-02T11:05:53Z Disabled the @Generated annotation by default to avoid build failures with Java 11 - - - - - 9e1c4cd1 by Emmanuel Bourg at 2018-11-02T11:06:19Z Upload to unstable - - - - - 5 changed files: - debian/changelog - debian/control - + debian/patches/01-activation-dependency.patch - + debian/patches/02-disable-atgenerated-annotation-by-default.patch - + debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +istack-commons (3.0.6-3) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with Java 11 (Closes: #912455) + * Disabled the @Generated annotation by default to avoid build failures + when Java 11 is used to compile the generated classes. + * Standards-Version updated to 4.2.1 + + -- Emmanuel Bourg <[email protected]> Fri, 02 Nov 2018 12:06:13 +0100 + istack-commons (3.0.6-2) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -10,6 +10,7 @@ Build-Depends: default-jdk, junit (>= 3.8.2), junit4, + libactivation-java, libargs4j-java (>= 2.0.1), libbuild-helper-maven-plugin-java, libcodemodel-java (>= 2.6), @@ -25,7 +26,7 @@ Build-Depends: libwagon-http-java, maven-debian-helper (>= 2.2), testng (>= 6) -Standards-Version: 4.2.0 +Standards-Version: 4.2.1 Vcs-Git: https://salsa.debian.org/java-team/istack-commons.git Vcs-Browser: https://salsa.debian.org/java-team/istack-commons Homepage: https://javaee.github.io/jaxb-istack-commons/ ===================================== debian/patches/01-activation-dependency.patch ===================================== @@ -0,0 +1,17 @@ +Description: Adds the dependency on the Activation Framework to fix the build failure with Java 11. +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/istack-commons/runtime/pom.xml ++++ b/istack-commons/runtime/pom.xml +@@ -71,6 +71,11 @@ + + <dependencies> + <dependency> ++ <groupId>com.sun.activation</groupId> ++ <artifactId>javax.activation</artifactId> ++ <version>1.2.0</version> ++ </dependency> ++ <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> ===================================== debian/patches/02-disable-atgenerated-annotation-by-default.patch ===================================== @@ -0,0 +1,15 @@ +Description: Disables the @Generated annotation, since Java 11 this annotation + is no longer in the standard JDK and causes build failures. +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/istack-commons/maven-plugin/src/main/java/com/sun/istack/maven/ResourceGenMojo.java ++++ b/istack-commons/maven-plugin/src/main/java/com/sun/istack/maven/ResourceGenMojo.java +@@ -128,7 +128,7 @@ + * Mark generated sources with {@code @javax.annotation.Generated}. + * @since 3.0.5 + */ +- @Parameter(property = "atGenerated", defaultValue = "true") ++ @Parameter(property = "atGenerated", defaultValue = "false") + private boolean atGenerated; + + /** ===================================== debian/patches/series ===================================== @@ -0,0 +1,2 @@ +01-activation-dependency.patch +02-disable-atgenerated-annotation-by-default.patch View it on GitLab: https://salsa.debian.org/java-team/istack-commons/compare/3be95527268d7a4ab0cb56bc5672efdc91de243c...9e1c4cd11961dac8ce274933e7eed1256e850c18 -- View it on GitLab: https://salsa.debian.org/java-team/istack-commons/compare/3be95527268d7a4ab0cb56bc5672efdc91de243c...9e1c4cd11961dac8ce274933e7eed1256e850c18 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
