Skip to content

Commit 81d2119

Browse files
authored
Merge pull request #8472 from apache/delivery
Sync delivery to release260 for 26-rc3
2 parents 473241e + ef64307 commit 81d2119

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,10 @@ public final class GradleDistributionManager {
101101
GradleVersion.version("8.5"), // JDK-21
102102
GradleVersion.version("8.8"), // JDK-22
103103
GradleVersion.version("8.10"),// JDK-23
104+
GradleVersion.version("8.14"),// JDK-24
104105
};
105106

106-
private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("8.10"); //NOI18N
107+
private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("8.14"); //NOI18N
107108

108109
final File gradleUserHome;
109110

extide/libs.gradle/external/binaries-list

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
1FC754376876B11AE26D811F8812AA37773660DD https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.10/gradle-tooling-api-8.10.jar gradle-tooling-api-8.10.jar
18+
A294A78C613552ACAD8FC9362806CEB21245174F https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.14/gradle-tooling-api-8.14.jar gradle-tooling-api-8.14.jar

extide/libs.gradle/external/gradle-tooling-api-8.10-license.txt renamed to extide/libs.gradle/external/gradle-tooling-api-8.14-license.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Name: Gradle Tooling API
22
Description: Gradle Tooling API
3-
Version: 8.10
4-
Files: gradle-tooling-api-8.10.jar
3+
Version: 8.14
4+
Files: gradle-tooling-api-8.14.jar
55
License: Apache-2.0
66
Origin: Gradle Inc.
77
URL: https://gradle.org/

extide/libs.gradle/nbproject/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
2222
# Sigtest fails to read the classes in the gradle-tooling-api
2323
sigtest.skip.gen=true
2424

25-
release.external/gradle-tooling-api-8.10.jar=modules/gradle/gradle-tooling-api.jar
25+
release.external/gradle-tooling-api-8.14.jar=modules/gradle/gradle-tooling-api.jar

extide/libs.gradle/nbproject/project.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</public-packages>
4040
<class-path-extension>
4141
<runtime-relative-path>gradle/gradle-tooling-api.jar</runtime-relative-path>
42-
<binary-origin>external/gradle-tooling-api-8.10.jar</binary-origin>
42+
<binary-origin>external/gradle-tooling-api-8.14.jar</binary-origin>
4343
</class-path-extension>
4444
</data>
4545
</configuration>

java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Wizards.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public final class Wizards {
3535

3636
private Wizards() {};
3737

38-
private static final List<Integer> JAVA_VERSIONS = List.of(23, 22, 21, 17, 11, 8);
38+
private static final List<Integer> JAVA_VERSIONS = List.of(24, 23, 22, 21, 17, 11, 8);
3939
private static final List<TestFramework> JAVA_TEST_FRAMEWORKS = List.of(
4040
JUNIT,
4141
JUNIT_5,

0 commit comments

Comments
 (0)