Gradle Tooling Upgrade to 7.4 #3641
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lkishalmi
force-pushed
the
gradle-upgrade-7.4
branch
from
4b65a0f
to
0b9b02e
Compare
There was a problem hiding this comment.
Looks mostly sane to me. verify-libs-and-licenses is not happy. You'll need to update nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps:
# This patch file was generated by NetBeans IDE
# It uses platform neutral UTF-8 encoding and \n newlines.
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -74,17 +74,24 @@
enterprise/web.core.syntax/external/struts-tiles-1.3.10.jar enterprise/web.struts/external/struts-tiles-1.3.10.jar
# gradle is used at build-time, so we can ignore the duplicates
-extide/gradle/external/gradle-7.3-bin.zip enterprise/libs.amazon/external/ion-java-1.0.2.jar
-extide/gradle/external/gradle-7.3-bin.zip ide/c.jcraft.jsch/external/jsch-0.1.55.jar
-extide/gradle/external/gradle-7.3-bin.zip ide/c.jcraft.jzlib/external/jzlib-1.1.3.jar
-extide/gradle/external/gradle-7.3-bin.zip ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2.jar
-extide/gradle/external/gradle-7.3-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar
-extide/gradle/external/gradle-7.3-bin.zip ide/o.eclipse.jgit/external/org.eclipse.jgit-5.7.0.202003110725-r.jar
-extide/gradle/external/gradle-7.3-bin.zip java/maven.embedder/external/apache-maven-3.8.4-bin.zip
-extide/gradle/external/gradle-7.3-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar
-extide/gradle/external/gradle-7.3-bin.zip platform/libs.junit4/external/junit-4.13.2.jar
-extide/gradle/external/gradle-7.3-bin.zip platform/libs.testng/external/jcommander-1.78.jar
-extide/gradle/external/gradle-7.3-bin.zip platform/o.apache.commons.io/external/commons-io-2.6.jar
+extide/gradle/external/gradle-7.4-bin.zip enterprise/libs.amazon/external/ion-java-1.0.2.jar
+extide/gradle/external/gradle-7.4-bin.zip ide/c.jcraft.jsch/external/jsch-0.1.55.jar
+extide/gradle/external/gradle-7.4-bin.zip ide/c.jcraft.jzlib/external/jzlib-1.1.3.jar
+extide/gradle/external/gradle-7.4-bin.zip ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2.jar
+extide/gradle/external/gradle-7.4-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar
+extide/gradle/external/gradle-7.4-bin.zip ide/o.eclipse.jgit/external/org.eclipse.jgit-5.7.0.202003110725-r.jar
+extide/gradle/external/gradle-7.4-bin.zip java/maven.embedder/external/apache-maven-3.8.4-bin.zip
+extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar
+extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/junit-4.13.2.jar
+extide/gradle/external/gradle-7.4-bin.zip platform/libs.testng/external/jcommander-1.78.jar
+extide/gradle/external/gradle-7.4-bin.zip platform/o.apache.commons.io/external/commons-io-2.6.jar
+extide/gradle/external/gradle-7.4-bin.zip enterprise/cloud.oracle/external/jsr305-3.0.2.jar
+extide/gradle/external/gradle-7.4-bin.zip ide/bcpkix/external/bcpkix-jdk15on-1.68.jar
+extide/gradle/external/gradle-7.4-bin.zip ide/bcprov/external/bcprov-jdk15on-1.68.jar
+extide/gradle/external/gradle-7.4-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.15.jar
+extide/gradle/external/gradle-7.4-bin.zip platform/libs.asm/external/asm-9.2.jar
+extide/gradle/external/gradle-7.4-bin.zip platform/libs.asm/external/asm-commons-9.2.jar
+extide/gradle/external/gradle-7.4-bin.zip platform/libs.asm/external/asm-tree-9.2.jar
# These are the endorsed version of the javaee apis and create libraries, so they are better kept separate
enterprise/javaee.api/external/javax.annotation-api-1.2.jar enterprise/javaee7.api/external/javax.annotation-api-1.2.jar
@@ -125,9 +132,4 @@
java/libs.javacapi/external/nb-javac-jdk-17.0.1-ga-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-17.0.1-ga-api.jar
java/libs.javacapi/external/nb-javac-jdk-17.0.1-ga.jar java/libs.nbjavacapi/external/nb-javac-jdk-17.0.1-ga.jar
-# Maven and Gradle are self-contained distributions - ignoring overlaps
-enterprise/cloud.oracle/external/jsr305-3.0.2.jar extide/gradle/external/gradle-7.3-bin.zip
-ide/bcpkix/external/bcpkix-jdk15on-1.68.jar extide/gradle/external/gradle-7.3-bin.zip
-ide/bcprov/external/bcprov-jdk15on-1.68.jar extide/gradle/external/gradle-7.3-bin.zip
-platform/o.apache.commons.codec/external/commons-codec-1.15.jar extide/gradle/external/gradle-7.3-bin.zip
platform/o.apache.commons.lang3/external/commons-lang3-3.8.1.jar java/maven.embedder/external/apache-maven-3.8.4-bin.zipThis change pull all gradle related ignores together and updates them to 7.4.
lkishalmi
force-pushed
the
gradle-upgrade-7.4
branch
2 times, most recently
from
4246eb0
to
6b1a57a
Compare
|
Thanks for the patch, just applied that one and updated this PR. |
lkishalmi
force-pushed
the
gradle-upgrade-7.4
branch
from
6b1a57a
to
af7cc6e
Compare
lkishalmi
force-pushed
the
gradle-upgrade-7.4
branch
from
af7cc6e
to
cd02118
Compare
sdedic
reviewed
Feb 22, 2022
There was a problem hiding this comment.
Tested with locally built Apache NetBeans Language Server distribution in vscode - looks good, working against old and newly generated projects, with JDK11 as well as JDK17.
@lkishalmi I'd like to kindly ask that someone from the LSP / NBLS developers should be added as a reviewer whenever Gradle library / infrastructure is going to be upgraded or conceptually changed. Our efforts cover (among other things) Gradle + Micronaut scenario, so gradle functionality is somewhate critical for us. Thanks :)
|
@sdedic sure! Also I considered your review as an approve, so I've merged this one in. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Simple upgrade of the Gradle runtime.