Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (4)
Standards-Version updated to 4.2.1
· 08863cca
Emmanuel Bourg
authored
Nov 02, 2018
08863cca
Fixed the build failure with Java 11 (Closes: #912455)
· 459b2339
Emmanuel Bourg
authored
Nov 02, 2018
459b2339
Disabled the @Generated annotation by default to avoid build failures with Java 11
· a2b6f980
Emmanuel Bourg
authored
Nov 02, 2018
a2b6f980
Upload to unstable
· 9e1c4cd1
Emmanuel Bourg
authored
Nov 02, 2018
9e1c4cd1
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
9e1c4cd1
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 <ebourg@apache.org> Fri, 02 Nov 2018 12:06:13 +0100
istack-commons (3.0.6-2) unstable; urgency=medium
* Team upload.
...
...
debian/control
View file @
9e1c4cd1
...
...
@@ -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 → 100644
View file @
9e1c4cd1
Description: Adds the dependency on the Activation Framework to fix the build failure with Java 11.
Author: Emmanuel Bourg <ebourg@apache.org>
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 → 100644
View file @
9e1c4cd1
Description: Disables the @Generated annotation, since Java 11 this annotation
is no longer in the standard JDK and causes build failures.
Author: Emmanuel Bourg <ebourg@apache.org>
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 → 100644
View file @
9e1c4cd1
01-activation-dependency.patch
02-disable-atgenerated-annotation-by-default.patch