Skip to content

Commit a629d9b

Browse files
committed
Fix UpdateGradleWrapper emitting malformed CLASSPATH for Gradle 8.14+
The pre-computed unix wrapper scripts for Gradle 8.14.x and 9.0.x contained `CLASSPATH="\\\"\\\""` instead of the empty `CLASSPATH=` emitted by the official Gradle wrapper template. Set the binding to empty (matching the 9.1.0+ branch) and remove the compensating post-processing replace, then regenerate the affected resource files. Fixes #7564
1 parent 4864a79 commit a629d9b

5 files changed

Lines changed: 28 additions & 29 deletions

File tree

rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/665958e3.txt renamed to rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/47c95633.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
117+
CLASSPATH=
118118

119119

120120
# Determine the Java command to use to start the JVM.

rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/b67a59d5.txt renamed to rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/8e765725.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
117+
CLASSPATH=
118118

119119

120120
# Determine the Java command to use to start the JVM.

rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/versions.csv

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,29 +42,29 @@ version,gradlew,gradlewBat
4242
9.1.0-rc-3,e5083bb6,9af86e4b
4343
9.1.0-rc-2,e5083bb6,9af86e4b
4444
9.1.0-rc-1,e5083bb6,9af86e4b
45-
9.0.0,665958e3,a43e7a0f
46-
9.0.0-rc-4,665958e3,a43e7a0f
47-
9.0.0-rc-3,665958e3,a43e7a0f
48-
9.0.0-rc-2,665958e3,a43e7a0f
49-
9.0.0-rc-1,665958e3,a43e7a0f
50-
9.0.0-milestone-9,665958e3,a43e7a0f
51-
9.0.0-milestone-8,665958e3,a43e7a0f
52-
9.0.0-milestone-10,665958e3,a43e7a0f
53-
9.0-milestone-2,665958e3,a43e7a0f
45+
9.0.0,47c95633,a43e7a0f
46+
9.0.0-rc-4,47c95633,a43e7a0f
47+
9.0.0-rc-3,47c95633,a43e7a0f
48+
9.0.0-rc-2,47c95633,a43e7a0f
49+
9.0.0-rc-1,47c95633,a43e7a0f
50+
9.0.0-milestone-9,47c95633,a43e7a0f
51+
9.0.0-milestone-8,47c95633,a43e7a0f
52+
9.0.0-milestone-10,47c95633,a43e7a0f
53+
9.0-milestone-2,47c95633,a43e7a0f
5454
9.0-milestone-1,611e634e,5e608638
55-
9.0-milestone-6,665958e3,a43e7a0f
56-
9.0-milestone-5,665958e3,a43e7a0f
57-
9.0-milestone-4,665958e3,a43e7a0f
58-
9.0-milestone-3,665958e3,a43e7a0f
59-
9.0-milestone-7,665958e3,a43e7a0f
60-
8.14.4,b67a59d5,a43e7a0f
61-
8.14.3,b67a59d5,a43e7a0f
62-
8.14.2,b67a59d5,a43e7a0f
63-
8.14.1,b67a59d5,a43e7a0f
64-
8.14,b67a59d5,a43e7a0f
65-
8.14-rc-3,b67a59d5,a43e7a0f
66-
8.14-rc-2,b67a59d5,a43e7a0f
67-
8.14-rc-1,b67a59d5,a43e7a0f
55+
9.0-milestone-6,47c95633,a43e7a0f
56+
9.0-milestone-5,47c95633,a43e7a0f
57+
9.0-milestone-4,47c95633,a43e7a0f
58+
9.0-milestone-3,47c95633,a43e7a0f
59+
9.0-milestone-7,47c95633,a43e7a0f
60+
8.14.4,8e765725,a43e7a0f
61+
8.14.3,8e765725,a43e7a0f
62+
8.14.2,8e765725,a43e7a0f
63+
8.14.1,8e765725,a43e7a0f
64+
8.14,8e765725,a43e7a0f
65+
8.14-rc-3,8e765725,a43e7a0f
66+
8.14-rc-2,8e765725,a43e7a0f
67+
8.14-rc-1,8e765725,a43e7a0f
6868
8.14-milestone-5,611e634e,5e608638
6969
8.14-milestone-7,611e634e,5e608638
7070
8.14-milestone-8,611e634e,5e608638

rewrite-gradle/src/test/java/org/openrewrite/gradle/internal/GradleWrapperScriptDownloader.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,15 +209,15 @@ private static Map<String, String> unixBindings(String gradleVersion) {
209209
binding.put("entryPointArgs", "-jar \"$APP_HOME/gradle/wrapper/gradle-wrapper.jar\"");
210210
binding.put("mainClassName", "");
211211
} else if (current.compareTo(GRADLE_9_0_M_2) >= 0) {
212-
binding.put("classpath", "\"\\\\\\\"\\\\\\\"\"");
212+
binding.put("classpath", "");
213213
binding.put("entryPointArgs", "-jar \"$APP_HOME/gradle/wrapper/gradle-wrapper.jar\"");
214214
binding.put("mainClassName", "");
215215
} else if (current.compareTo(GRADLE_9_0_M_1) >= 0) {
216216
binding.put("classpath", "$APP_HOME/gradle/wrapper/gradle-wrapper.jar");
217217
binding.put("entryPointArgs", "");
218218
binding.put("mainClassName", "org.gradle.wrapper.GradleWrapperMain");
219219
} else if (current.compareTo(GRADLE_8_14_RC_1) >= 0) {
220-
binding.put("classpath", "\"\\\\\\\\\\\"\\\\\\\\\\\"\"");
220+
binding.put("classpath", "");
221221
binding.put("entryPointArgs", "-jar \"$APP_HOME/gradle/wrapper/gradle-wrapper.jar\"");
222222
binding.put("mainClassName", "");
223223
} else if (current.compareTo(GRADLE_1_0_M_8) >= 0) {
@@ -281,8 +281,7 @@ private static Map<String, String> defaultBindings() {
281281
private static String renderTemplate(String source, Map<String, String> bindings, String lineSeparator) throws IOException, ClassNotFoundException {
282282
SimpleTemplateEngine engine = new SimpleTemplateEngine();
283283
return engine.createTemplate(source).make(new HashMap<>(bindings)).toString()
284-
.replaceAll("\\R", lineSeparator)
285-
.replace("CLASSPATH=\"\\\\\\\\\\\"\\\\\\\\\\\"", "CLASSPATH=\"\\\\\\\"\\\\\\\"");
284+
.replaceAll("\\R", lineSeparator);
286285
}
287286

288287
private static String hash(String text) {

rewrite-gradle/src/test/resources/org/openrewrite/gradle/gradlew-8.14

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
117+
CLASSPATH=
118118

119119

120120
# Determine the Java command to use to start the JVM.

0 commit comments

Comments
 (0)