Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gradle
Commits:
0ef5caf9 by Emmanuel Bourg at 2023-01-20T18:34:34+01:00
Do not attempt to run the tests (triggered by debhelper 13)
- - - - -
8ee0601c by Emmanuel Bourg at 2023-01-20T18:34:42+01:00
Standards-Version updated to 4.6.2
- - - - -
9d058a54 by Emmanuel Bourg at 2023-01-21T14:23:45+01:00
No longer use the --illegal-access=permit option (Closes: #1023553)
- - - - -
be410ae1 by Emmanuel Bourg at 2023-01-21T14:25:38+01:00
Use the --add-opens option only if the JVM supports it (Closes: #1020975)
- - - - -
ace60ea0 by Emmanuel Bourg at 2023-01-21T14:26:36+01:00
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/patches/permit-illegal-access.patch
- debian/rules
- − gradle.properties
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+gradle (4.4.1-17) unstable; urgency=medium
+
+ * Team upload.
+ * No longer use the --illegal-access=permit option (Closes: #1023553)
+ * Use the --add-opens option only if the JVM supports it (Closes: #1020975)
+ * Do not attempt to run the tests (triggered by debhelper 13)
+ * Standards-Version updated to 4.6.2
+
+ -- Emmanuel Bourg <ebo...@apache.org> Sat, 21 Jan 2023 14:26:10 +0100
+
gradle (4.4.1-16) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -67,7 +67,7 @@ Build-Depends: ant,
libxerces2-java,
maven-repo-helper,
testng
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/gradle.git
Vcs-Browser: https://salsa.debian.org/java-team/gradle
Homepage: https://gradle.org
=====================================
debian/patches/permit-illegal-access.patch
=====================================
@@ -1,14 +1,43 @@
-Description: Adds the --illegal-access=permit option to run Gradle on Java 17
+Description: Adds the --add-opens option to run Gradle on Java 17
Author: Emmanuel Bourg <ebo...@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 @@
+@@ -162,6 +162,10 @@
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 --add-opens
java.base/java.lang=ALL-UNNAMED \$JAVA_OPTS \$${optsEnvironmentVar} <% if (
appNameSystemProperty ) { %>"\"-D${appNameSystemProperty}=\$APP_BASE_NAME\"" <%
} %>-classpath "\"\$CLASSPATH\"" ${mainClassName} "\$APP_ARGS"
++if \$JAVACMD --add-opens java.base/java.lang=ALL-UNNAMED -version ; then
++ DEFAULT_JVM_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED
\$DEFAULT_JVM_OPTS"
++fi
++
+ eval set -- \$DEFAULT_JVM_OPTS \$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
+---
a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DefaultDaemonStarter.java
++++
b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DefaultDaemonStarter.java
+@@ -91,10 +91,24 @@
+
+ versionValidator.validate(daemonParameters);
+
++ // check the version of the JDK
++ boolean jpms;
++ try {
++ Process process = new
ProcessBuilder(daemonParameters.getEffectiveJvm().getJavaExecutable().getAbsolutePath(),
++ "--add-opens",
"java.base/java.lang=ALL-UNNAMED", "-version").start();
++ jpms = process.waitFor() == 0;
++ } catch (Exception e) {
++ jpms = false;
++ }
++
+ List<String> daemonArgs = new ArrayList<String>();
+
daemonArgs.add(daemonParameters.getEffectiveJvm().getJavaExecutable().getAbsolutePath());
+
+ List<String> daemonOpts = daemonParameters.getEffectiveJvmArgs();
++ if (jpms) {
++ daemonArgs.add("--add-opens");
++ daemonArgs.add("java.base/java.lang=ALL-UNNAMED");
++ }
+ daemonArgs.addAll(daemonOpts);
+ daemonArgs.add("-cp");
+ daemonArgs.add(CollectionUtils.join(File.pathSeparator,
classpath.getAsFiles()));
=====================================
debian/rules
=====================================
@@ -86,6 +86,8 @@ override_dh_auto_build: debian/gradle.1
ln --symbolic --force --target-directory=buildSrc/src/main/java/tmp/
$(patsubst %,../../../../../%,$(GRADLE_COMPAT_BUILDSRC_SOURCE))
gradle $(GRADLE_TASKS) $(GRADLE_FLAGS)
+override_dh_auto_test:
+
override_dh_auto_clean:
dh_auto_clean
find . -wholename .*build/generated-resources | xargs echo | sed -e
's^build/generated-resources^build^g' | xargs rm -Rf
=====================================
gradle.properties deleted
=====================================
@@ -1,2 +0,0 @@
-org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError
-Dfile.encoding=UTF-8
-org.gradle.parallel=true
View it on GitLab:
https://salsa.debian.org/java-team/gradle/-/compare/1090dd8b4bcf25e8b808f61b0582ce825fbacbda...ace60ea0c6efab540dbca86a1eb850d50c6d9a7a
--
View it on GitLab:
https://salsa.debian.org/java-team/gradle/-/compare/1090dd8b4bcf25e8b808f61b0582ce825fbacbda...ace60ea0c6efab540dbca86a1eb850d50c6d9a7a
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
