Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gradle-debian-helper
Commits: ea1f96b1 by Emmanuel Bourg at 2023-01-22T10:03:33+01:00 No longer set the --add-opens option - - - - - 93d8f84c by Emmanuel Bourg at 2023-01-22T10:03:42+01:00 Standards-Version updated to 4.6.2 - - - - - bdcfb6a6 by Emmanuel Bourg at 2023-01-22T10:04:00+01:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - − gradle-helper-plugin/src/main/java/org/debian/gradle/CheckJPMS.java - gradle-helper-plugin/src/main/perl/gradle.pm Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +gradle-debian-helper (2.4) unstable; urgency=medium + + * No longer set the --add-opens option, Gradle handles it more accurately + * Standards-Version updated to 4.6.2 + + -- Emmanuel Bourg <[email protected]> Sun, 22 Jan 2023 10:03:54 +0100 + gradle-debian-helper (2.3) unstable; urgency=medium * Check the JDK specified by the JAVA_HOME environment variable before ===================================== debian/control ===================================== @@ -7,9 +7,9 @@ Uploaders: Build-Depends: debhelper-compat (= 13), default-jdk-headless | default-jdk, - gradle (>= 4.4), + gradle (>= 4.4.1-18~), maven-debian-helper -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/java-team/gradle-debian-helper.git Vcs-Browser: https://salsa.debian.org/java-team/gradle-debian-helper @@ -17,7 +17,7 @@ Package: gradle-debian-helper Architecture: all Depends: default-jre-headless | java7-runtime-headless, - gradle (>= 3.4.1-8~), + gradle (>= 4.4.1-18~), maven-repo-helper, ${misc:Depends} Description: Helper tools for building Debian packages with Gradle ===================================== gradle-helper-plugin/src/main/java/org/debian/gradle/CheckJPMS.java deleted ===================================== @@ -1,32 +0,0 @@ -/** - * Copyright 2022 Emmanuel Bourg - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.debian.gradle; - -/** - * Check if the current JRE supports JPMS modules. - */ -public class CheckJPMS { - - public static void main(String[] args) { - try { - Class.forName("java.lang.Module"); - System.exit(0); - } catch (ClassNotFoundException e) { - System.exit(1); - } - } -} ===================================== gradle-helper-plugin/src/main/perl/gradle.pm ===================================== @@ -91,25 +91,12 @@ sub _execute_gradle_task { $this->doit_in_builddir("mkdir", "-p", ".gradle/init.d"); $this->doit_in_builddir("cp", "/usr/share/gradle-debian-helper/init.gradle", ".gradle/init.d/"); - my $ADD_OPENS = ""; - if (_check_jpms()) { - $ADD_OPENS .= " --add-opens java.base/java.lang=ALL-UNNAMED"; - } - # Add the hook to the classpath my $hookClasspath = "/usr/share/java/gradle-helper-hook.jar:/usr/share/java/maven-repo-helper.jar"; $ENV{JAVA_OPTS} .= " -Xbootclasspath/a:$hookClasspath"; - $ENV{JAVA_OPTS} .= " -Dorg.gradle.jvmargs='-Xbootclasspath/a:$hookClasspath $ADD_OPENS'"; + $ENV{JAVA_OPTS} .= " -Dorg.gradle.jvmargs='-Xbootclasspath/a:$hookClasspath'"; $this->doit_in_builddir(@{$this->{gradle_cmd}}, @_); } -sub _check_jpms { - my $JAVA="java"; - if (defined $ENV{JAVA_HOME}) { - $JAVA="$ENV{JAVA_HOME}/bin/java"; - } - return system("$JAVA -cp /usr/share/java/gradle-helper-plugin.jar org.debian.gradle.CheckJPMS") == 0; -} - 1 View it on GitLab: https://salsa.debian.org/java-team/gradle-debian-helper/-/compare/43c59d21a3281094d01afec5445a37414cc2aa8a...bdcfb6a685aba23c0eff27b118e0d0e03bbff20d -- View it on GitLab: https://salsa.debian.org/java-team/gradle-debian-helper/-/compare/43c59d21a3281094d01afec5445a37414cc2aa8a...bdcfb6a685aba23c0eff27b118e0d0e03bbff20d 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
