This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a commit to branch release122 in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 1b29b550ec7b7c7b170815de61d0b66c99f51ec9 Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com> AuthorDate: Wed Oct 21 17:15:35 2020 -0700 [NETBEANS-4930] Upgrade Gradle Tooling 6.7 with JDK-15 Support --- extide/gradle/external/binaries-list | 2 +- ...-bin-license.txt => gradle-6.7-bin-license.txt} | 2 +- ....2-bin-notice.txt => gradle-6.7-bin-notice.txt} | 0 extide/gradle/netbeans-gradle-tooling/build.gradle | 6 ++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../api/execute/GradleDistributionManager.java | 1 + extide/libs.gradle/external/binaries-list | 2 +- ...ense.txt => gradle-tooling-api-6.7-license.txt} | 4 ++-- ...otice.txt => gradle-tooling-api-6.7-notice.txt} | 0 extide/libs.gradle/manifest.mf | 2 +- extide/libs.gradle/nbproject/project.properties | 2 +- extide/libs.gradle/nbproject/project.xml | 2 +- .../org/netbeans/nbbuild/extlibs/ignored-overlaps | 25 +++++++++++++++------- 13 files changed, 29 insertions(+), 21 deletions(-) diff --git a/extide/gradle/external/binaries-list b/extide/gradle/external/binaries-list index 12041c3..3b632ed 100644 --- a/extide/gradle/external/binaries-list +++ b/extide/gradle/external/binaries-list @@ -16,4 +16,4 @@ # under the License. A271DEA739D4EBBD1A51F282AA130EB9314AD830 gradle-wrapper-4.10.2.jar -2564503471E1FC18A4E7D2A120BC567EA3B26AA4 gradle-4.10.2-bin.zip +E2E8BEBFCC5BA21D6FE9A27325D10EC1DB5D83FA gradle-6.7-bin.zip diff --git a/extide/gradle/external/gradle-4.10.2-bin-license.txt b/extide/gradle/external/gradle-6.7-bin-license.txt similarity index 99% rename from extide/gradle/external/gradle-4.10.2-bin-license.txt rename to extide/gradle/external/gradle-6.7-bin-license.txt index 79fcd0e..3bbf060 100644 --- a/extide/gradle/external/gradle-4.10.2-bin-license.txt +++ b/extide/gradle/external/gradle-6.7-bin-license.txt @@ -1,6 +1,6 @@ Name: Gradle Description: Gradle Build System -Version: 4.10.2 +Version: 6.7 License: Gradle Origin: Gradle Inc. URL: https://gradle.org/ diff --git a/extide/gradle/external/gradle-4.10.2-bin-notice.txt b/extide/gradle/external/gradle-6.7-bin-notice.txt similarity index 100% rename from extide/gradle/external/gradle-4.10.2-bin-notice.txt rename to extide/gradle/external/gradle-6.7-bin-notice.txt diff --git a/extide/gradle/netbeans-gradle-tooling/build.gradle b/extide/gradle/netbeans-gradle-tooling/build.gradle index d9514eb..a8db3ec 100644 --- a/extide/gradle/netbeans-gradle-tooling/build.gradle +++ b/extide/gradle/netbeans-gradle-tooling/build.gradle @@ -21,19 +21,17 @@ apply plugin: 'groovy' apply plugin: 'application' mainClassName = 'org.netbeans.modules.gradle.DebugTooling' -def toolingApiVersion = gradle.gradleVersion sourceCompatibility = '1.8' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' repositories { jcenter() - } dependencies { - compile gradleApi() - compile localGroovy() + implementation gradleApi() + implementation localGroovy() } testClasses.dependsOn('jar') diff --git a/extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties b/extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties index 949ff8e..89a8925 100644 --- a/extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties +++ b/extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=../../../external/gradle-4.10.2-bin.zip +distributionUrl=../../../external/gradle-6.7-bin.zip diff --git a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java index f0760ea..710c0a4 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java @@ -88,6 +88,7 @@ public final class GradleDistributionManager { GradleVersion.version("5.4"), // JDK-12 GradleVersion.version("6.0"), // JDK-13 GradleVersion.version("6.3"), // JDK-14 + GradleVersion.version("6.7"), // JDK-15 }; private static final int JAVA_VERSION; diff --git a/extide/libs.gradle/external/binaries-list b/extide/libs.gradle/external/binaries-list index d1a6c35..8b64f80 100644 --- a/extide/libs.gradle/external/binaries-list +++ b/extide/libs.gradle/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -74D642F331F4893E34F5063EE9A152D8C29D8323 gradle-tooling-api-6.6.jar +566891D3FE72F69C9038A921BBE6CE255A77D4A1 gradle-tooling-api-6.7.jar diff --git a/extide/libs.gradle/external/gradle-tooling-api-6.6-license.txt b/extide/libs.gradle/external/gradle-tooling-api-6.7-license.txt similarity index 99% rename from extide/libs.gradle/external/gradle-tooling-api-6.6-license.txt rename to extide/libs.gradle/external/gradle-tooling-api-6.7-license.txt index aacd680..de5cb6f 100644 --- a/extide/libs.gradle/external/gradle-tooling-api-6.6-license.txt +++ b/extide/libs.gradle/external/gradle-tooling-api-6.7-license.txt @@ -1,7 +1,7 @@ Name: Gradle Wrapper Description: Gradle Tooling API -Version: 6.6 -Files: gradle-tooling-api-6.6.jar +Version: 6.7 +Files: gradle-tooling-api-6.7.jar License: Apache-2.0 Origin: Gradle Inc. URL: https://gradle.org/ diff --git a/extide/libs.gradle/external/gradle-tooling-api-6.6-notice.txt b/extide/libs.gradle/external/gradle-tooling-api-6.7-notice.txt similarity index 100% rename from extide/libs.gradle/external/gradle-tooling-api-6.6-notice.txt rename to extide/libs.gradle/external/gradle-tooling-api-6.7-notice.txt diff --git a/extide/libs.gradle/manifest.mf b/extide/libs.gradle/manifest.mf index b166da8..6783a90 100644 --- a/extide/libs.gradle/manifest.mf +++ b/extide/libs.gradle/manifest.mf @@ -2,5 +2,5 @@ Manifest-Version: 1.0 AutoUpdate-Show-In-Client: false OpenIDE-Module: org.netbeans.modules.libs.gradle/6 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/libs/gradle/Bundle.properties -OpenIDE-Module-Specification-Version: 6.6 +OpenIDE-Module-Specification-Version: 6.7 diff --git a/extide/libs.gradle/nbproject/project.properties b/extide/libs.gradle/nbproject/project.properties index d1e7d6b..2aa7db2 100644 --- a/extide/libs.gradle/nbproject/project.properties +++ b/extide/libs.gradle/nbproject/project.properties @@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial # For more information, please see http://wiki.netbeans.org/SignatureTest sigtest.gen.fail.on.error=false -release.external/gradle-tooling-api-6.6.jar=modules/gradle/gradle-tooling-api.jar +release.external/gradle-tooling-api-6.7.jar=modules/gradle/gradle-tooling-api.jar diff --git a/extide/libs.gradle/nbproject/project.xml b/extide/libs.gradle/nbproject/project.xml index 05000d1..30c9348 100644 --- a/extide/libs.gradle/nbproject/project.xml +++ b/extide/libs.gradle/nbproject/project.xml @@ -39,7 +39,7 @@ </public-packages> <class-path-extension> <runtime-relative-path>gradle/gradle-tooling-api.jar</runtime-relative-path> - <binary-origin>external/gradle-tooling-api-6.6.jar</binary-origin> + <binary-origin>external/gradle-tooling-api-6.7.jar</binary-origin> </class-path-extension> </data> </configuration> diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 924751e..a3a6f98 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -57,14 +57,23 @@ enterprise/web.core.syntax/external/struts-taglib-1.3.10.jar enterprise/web.stru 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-4.10.2-bin.zip ide/c.jcraft.jsch/external/jsch-0.1.54.jar -extide/gradle/external/gradle-4.10.2-bin.zip ide/o.apache.commons.lang/external/commons-io-2.5.jar -extide/gradle/external/gradle-4.10.2-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar -extide/gradle/external/gradle-4.10.2-bin.zip java/maven.embedder/external/apache-maven-3.6.3-bin.zip -extide/gradle/external/gradle-4.10.2-bin.zip platform/api.annotations.common/external/jsr305-3.0.2.jar -extide/gradle/external/gradle-4.10.2-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar -extide/gradle/external/gradle-4.10.2-bin.zip platform/libs.junit4/external/junit-4.12.jar -extide/gradle/external/gradle-4.10.2-bin.zip java/maven/external/aether-api-1.13.1.jar +extide/gradle/external/gradle-6.7-bin.zip enterprise/libs.amazon/external/ion-java-1.0.2.jar +extide/gradle/external/gradle-6.7-bin.zip extide/o.apache.tools.ant.module/external/ant-1.10.8.jar +extide/gradle/external/gradle-6.7-bin.zip extide/o.apache.tools.ant.module/external/ant-launcher-1.10.8.jar +extide/gradle/external/gradle-6.7-bin.zip ide/bcpg/external/bcpg-jdk15on-1.64.jar +extide/gradle/external/gradle-6.7-bin.zip ide/bcprov/external/bcprov-jdk15on-1.64.jar +extide/gradle/external/gradle-6.7-bin.zip ide/c.google.gson/external/gson-2.8.5.jar +extide/gradle/external/gradle-6.7-bin.zip ide/c.jcraft.jsch/external/jsch-0.1.55.jar +extide/gradle/external/gradle-6.7-bin.zip ide/c.jcraft.jzlib/external/jzlib-1.1.3.jar +extide/gradle/external/gradle-6.7-bin.zip ide/libs.commons_compress/external/commons-compress-1.19.jar +extide/gradle/external/gradle-6.7-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar +extide/gradle/external/gradle-6.7-bin.zip ide/slf4j.api/external/slf4j-api-1.7.28.jar +extide/gradle/external/gradle-6.7-bin.zip java/maven/external/aether-api-1.13.1.jar +extide/gradle/external/gradle-6.7-bin.zip java/maven.embedder/external/apache-maven-3.6.3-bin.zip +extide/gradle/external/gradle-6.7-bin.zip platform/api.annotations.common/external/jsr305-3.0.2.jar +extide/gradle/external/gradle-6.7-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar +extide/gradle/external/gradle-6.7-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.13.jar +extide/gradle/external/gradle-6.7-bin.zip platform/o.apache.commons.io/external/commons-io-2.6.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 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists