[Git][java-team/gradle][master] 7 commits: Depend on libplexus-container-default-java instead of libplexus-container-default1.5-java
Emmanuel Bourg
gitlab at salsa.debian.org
Thu Feb 11 07:34:00 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gradle
Commits:
8ec0a0d2 by Emmanuel Bourg at 2021-02-11T08:31:45+01:00
Depend on libplexus-container-default-java instead of libplexus-container-default1.5-java
- - - - -
6e022ffd by Emmanuel Bourg at 2021-02-11T08:32:20+01:00
Set the minimum source level to 7 when building Gradle
- - - - -
0324bf59 by Emmanuel Bourg at 2021-02-11T08:32:22+01:00
Disable doclint when generating the Gradle javadoc
- - - - -
033c6768 by Emmanuel Bourg at 2021-02-11T08:32:22+01:00
Set the --illegal-access=permit option when launching Gradle (Closes: #981861)
- - - - -
77b4d0b7 by Emmanuel Bourg at 2021-02-11T08:32:22+01:00
Backported a fix to SourcepathIgnoringInvocationHandler to run with Java 9+ when illegal access isn't allowed
- - - - -
d0dc5c71 by Emmanuel Bourg at 2021-02-11T08:32:22+01:00
Standards-Version updated to 4.5.1
- - - - -
8d55a5ca by Emmanuel Bourg at 2021-02-11T08:32:51+01:00
Upload to unstable
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/docs.gradle
- + debian/patches/java17-compatibility.patch
- + debian/patches/permit-illegal-access.patch
- debian/patches/series
- debian/patches/source-level.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+gradle (4.4.1-13) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed OpenJDK 17 compatibility
+ - Set --illegal-access=permit when launching Gradle (Closes: #981861)
+ - Backported a fix to SourcepathIgnoringInvocationHandler to run with
+ Java 9+ when illegal access isn't allowed (the new default in Java 17)
+ - Set the minimum source level to 7 when building Gradle
+ - Disable doclint when generating the Gradle javadoc
+ * Depend on libplexus-container-default-java
+ instead of libplexus-container-default1.5-java
+ * Standards-Version updated to 4.5.1
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 11 Feb 2021 08:32:39 +0100
+
gradle (4.4.1-12) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -54,7 +54,7 @@ Build-Depends: ant,
libnekohtml-java,
libobjenesis-java,
libplexus-component-annotations-java (>= 1.7.1-6~),
- libplexus-container-default1.5-java,
+ libplexus-container-default-java,
libplexus-interpolation-java,
libplexus-utils-java,
libpolyglot-maven-java,
@@ -68,7 +68,7 @@ Build-Depends: ant,
libxerces2-java,
maven-repo-helper,
testng
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/gradle.git
Vcs-Browser: https://salsa.debian.org/java-team/gradle
Homepage: https://gradle.org
@@ -160,7 +160,7 @@ Depends: ant-optional,
libmaven3-core-java (>= 3.5.0),
libobjenesis-java,
libplexus-component-annotations-java,
- libplexus-container-default1.5-java,
+ libplexus-container-default-java,
libplexus-interpolation-java,
libplexus-utils-java,
libpolyglot-maven-java,
=====================================
debian/docs.gradle
=====================================
@@ -24,6 +24,7 @@ task javadocAll(type: Javadoc) {
options.encoding = 'UTF-8'
options.docEncoding = 'UTF-8'
options.charSet = 'UTF-8'
+ options.addBooleanOption('Xdoclint:none', true)
source publicGroovyProjects.collect { project -> project.sourceSets.main.allJava }
destinationDir = new File(docsDir, 'javadoc')
classpath = files(publicGroovyProjects.collect { project -> [project.sourceSets.main.compileClasspath, project.sourceSets.main.output] })
=====================================
debian/patches/java17-compatibility.patch
=====================================
@@ -0,0 +1,28 @@
+Description: Fix SourcepathIgnoringInvocationHandler on Java 9
+ Use the method provided by the proxy API instead of
+ trying to look up the same method on the delegate's
+ class. It is unclear why this was done in the first place.
+ Trying to access the method from the delegate lead to
+ illegal access exceptions on certain JDKs.
+ .
+ This patch can be removed after upgrading to Gradle 4.8
+Author: Stefan Oehme <stefan at gradle.com>
+Origin: upstream, https://github.com/gradle/gradle/commit/f6fd43e1
+--- a/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/reflect/SourcepathIgnoringInvocationHandler.java
++++ b/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/reflect/SourcepathIgnoringInvocationHandler.java
+@@ -37,7 +37,6 @@
+ @Override
+ @SuppressWarnings("unchecked")
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+- Method m = proxied.getClass().getMethod(method.getName(), method.getParameterTypes());
+ if (method.getName().equals(HAS_LOCATION_METHOD)) {
+ // There is currently a requirement in the JDK9 javac implementation
+ // that when javac is invoked with an explicitly empty sourcepath
+@@ -62,6 +61,6 @@
+ ((Set<JavaFileObject.Kind>) args[2]).remove(JavaFileObject.Kind.SOURCE);
+ }
+ }
+- return m.invoke(proxied, args);
++ return method.invoke(proxied, args);
+ }
+ }
=====================================
debian/patches/permit-illegal-access.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Adds the --illegal-access=permit option to run Gradle on Java 17
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
++++ b/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+@@ -162,7 +162,7 @@
+ APP_ARGS=\$(save "\$@")
+
+ # Collect all arguments for the java command, following the shell quoting and substitution rules
+-eval set -- \$DEFAULT_JVM_OPTS \$JAVA_OPTS \$${optsEnvironmentVar} <% if ( appNameSystemProperty ) { %>"\"-D${appNameSystemProperty}=\$APP_BASE_NAME\"" <% } %>-classpath "\"\$CLASSPATH\"" ${mainClassName} "\$APP_ARGS"
++eval set -- \$DEFAULT_JVM_OPTS --illegal-access=permit \$JAVA_OPTS \$${optsEnvironmentVar} <% if ( appNameSystemProperty ) { %>"\"-D${appNameSystemProperty}=\$APP_BASE_NAME\"" <% } %>-classpath "\"\$CLASSPATH\"" ${mainClassName} "\$APP_ARGS"
+
+ # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+ if [ "\$(uname)" = "Darwin" ] && [ "\$HOME" = "\$PWD" ]; then
=====================================
debian/patches/series
=====================================
@@ -18,7 +18,6 @@ maven-3.3-compatibility.patch
remove-timestamps.patch
use-local-artifacts.patch
cast-estimated-runtime-to-long.patch
-source-level.patch
java8-compatibility.patch
disable-binary-compatibility.patch
gradle-4-compatibility.patch
@@ -36,3 +35,6 @@ backport-FeaturePreviews.patch
backport-TaskProvider.patch
backport-NamedDomainObjectProvider.patch
backport-capabilities.patch
+source-level.patch
+permit-illegal-access.patch
+java17-compatibility.patch
=====================================
debian/patches/source-level.patch
=====================================
@@ -1,4 +1,4 @@
-Description: Set the language level to 1.8 to fix the build failure with Ant 1.10
+Description: Set the language level to 1.8 to fix the build failure with Ant 1.10 and OpenJDK 17
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/subprojects/core/core.gradle
@@ -12,3 +12,246 @@ Forwarded: not-needed
configurations {
reports
+--- a/subprojects/base-services-groovy/base-services-groovy.gradle
++++ b/subprojects/base-services-groovy/base-services-groovy.gradle
+@@ -15,7 +15,7 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ api libraries.groovy
+--- a/subprojects/base-services/base-services.gradle
++++ b/subprojects/base-services/base-services.gradle
+@@ -6,7 +6,7 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ api libraries.guava
+--- a/subprojects/build-option/build-option.gradle
++++ b/subprojects/build-option/build-option.gradle
+@@ -1,6 +1,6 @@
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ api project(':cli')
+--- a/subprojects/cli/cli.gradle
++++ b/subprojects/cli/cli.gradle
+@@ -22,6 +22,6 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ useClassycle()
+--- a/subprojects/core-api/core-api.gradle
++++ b/subprojects/core-api/core-api.gradle
+@@ -15,7 +15,7 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ api project(":baseServices")
+--- a/subprojects/dependency-management/dependency-management.gradle
++++ b/subprojects/dependency-management/dependency-management.gradle
+@@ -1,6 +1,6 @@
+ apply plugin: "groovy"
+
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.7
+
+ configurations {
+ mvn3Input
+--- a/subprojects/jvm-services/jvm-services.gradle
++++ b/subprojects/jvm-services/jvm-services.gradle
+@@ -3,7 +3,7 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ api project(":baseServices")
+--- a/subprojects/language-groovy/language-groovy.gradle
++++ b/subprojects/language-groovy/language-groovy.gradle
+@@ -1,6 +1,6 @@
+
+ // Compiler daemon
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.7
+
+ dependencies {
+ compile project(":core")
+--- a/subprojects/language-jvm/language-jvm.gradle
++++ b/subprojects/language-jvm/language-jvm.gradle
+@@ -1,4 +1,4 @@
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.7
+
+ dependencies {
+ compile project(":core")
+--- a/subprojects/launcher/launcher.gradle
++++ b/subprojects/launcher/launcher.gradle
+@@ -1,7 +1,7 @@
+ import org.gradle.build.GradleStartScriptGenerator
+
+ // Main entry point requires Java 5
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ configurations {
+ startScriptGenerator
+--- a/subprojects/logging/logging.gradle
++++ b/subprojects/logging/logging.gradle
+@@ -3,7 +3,7 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ api project(':baseServices')
+--- a/subprojects/messaging/messaging.gradle
++++ b/subprojects/messaging/messaging.gradle
+@@ -1,6 +1,6 @@
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ api project(':baseServices')
+--- a/subprojects/model-groovy/model-groovy.gradle
++++ b/subprojects/model-groovy/model-groovy.gradle
+@@ -20,7 +20,7 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ api project(':baseServices')
+--- a/subprojects/native/native.gradle
++++ b/subprojects/native/native.gradle
+@@ -3,7 +3,7 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ api project(':baseServices')
+--- a/subprojects/platform-play/platform-play.gradle
++++ b/subprojects/platform-play/platform-play.gradle
+@@ -1,7 +1,7 @@
+ apply plugin: "groovy"
+
+ // Compiler daemon
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.7
+
+ dependencies {
+ compile project(":core")
+--- a/subprojects/plugins/plugins.gradle
++++ b/subprojects/plugins/plugins.gradle
+@@ -14,7 +14,7 @@
+ * limitations under the License.
+ */
+
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.7
+
+ configurations {
+ testFixtures
+--- a/subprojects/process-services/process-services.gradle
++++ b/subprojects/process-services/process-services.gradle
+@@ -3,7 +3,7 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ api project(':baseServices')
+--- a/subprojects/resources/resources.gradle
++++ b/subprojects/resources/resources.gradle
+@@ -3,7 +3,7 @@
+ */
+ apply plugin: 'java-library'
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ api project(':baseServices')
+--- a/subprojects/scala/scala.gradle
++++ b/subprojects/scala/scala.gradle
+@@ -15,7 +15,7 @@
+ */
+
+ // Compiler daemon
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.7
+
+ dependencies {
+ compile libraries.groovy
+--- a/subprojects/tooling-api/tooling-api.gradle
++++ b/subprojects/tooling-api/tooling-api.gradle
+@@ -1,7 +1,7 @@
+ import org.gradle.ShadedJar
+
+ // GradleConnector entry point requires Java 5
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ configurations {
+ testPublishRuntime
+--- a/subprojects/workers/workers.gradle
++++ b/subprojects/workers/workers.gradle
+@@ -1,5 +1,5 @@
+
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ compile project(':core')
+--- a/subprojects/wrapper/wrapper.gradle
++++ b/subprojects/wrapper/wrapper.gradle
+@@ -15,7 +15,7 @@
+ */
+
+ // Wrapper main entry point requires Java 5
+-sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
++sourceCompatibility = javaVersion.java9Compatible ? 1.7 : 1.5
+
+ dependencies {
+ compile project(":cli")
+--- a/subprojects/testing-jvm/testing-jvm.gradle
++++ b/subprojects/testing-jvm/testing-jvm.gradle
+@@ -14,7 +14,7 @@
+ * limitations under the License.
+ */
+ // Test execution
+-sourceCompatibility = 1.6
++sourceCompatibility = 1.7
+
+ dependencies {
+ compile project(':core')
View it on GitLab: https://salsa.debian.org/java-team/gradle/-/compare/06588fe912cca025f36908a716cbb31ed8dedd97...8d55a5cae4dbaaac46538a6f6a3a77a743de2214
--
View it on GitLab: https://salsa.debian.org/java-team/gradle/-/compare/06588fe912cca025f36908a716cbb31ed8dedd97...8d55a5cae4dbaaac46538a6f6a3a77a743de2214
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/20210211/c3aa99d6/attachment.html>
More information about the pkg-java-commits
mailing list