diff --git a/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/665958e3.txt b/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/47c95633.txt similarity index 99% rename from rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/665958e3.txt rename to rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/47c95633.txt index ef07e0162b1..9ce005f99e5 100644 --- a/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/665958e3.txt +++ b/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/47c95633.txt @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" +CLASSPATH= # Determine the Java command to use to start the JVM. diff --git a/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/b67a59d5.txt b/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/8e765725.txt similarity index 99% rename from rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/b67a59d5.txt rename to rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/8e765725.txt index 23d15a93670..2fedc1a0b7d 100644 --- a/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/b67a59d5.txt +++ b/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/unix/8e765725.txt @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" +CLASSPATH= # Determine the Java command to use to start the JVM. diff --git a/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/versions.csv b/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/versions.csv index 9832bd1f043..77b9a7cdf8b 100644 --- a/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/versions.csv +++ b/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/versions.csv @@ -42,29 +42,29 @@ version,gradlew,gradlewBat 9.1.0-rc-3,e5083bb6,9af86e4b 9.1.0-rc-2,e5083bb6,9af86e4b 9.1.0-rc-1,e5083bb6,9af86e4b -9.0.0,665958e3,a43e7a0f -9.0.0-rc-4,665958e3,a43e7a0f -9.0.0-rc-3,665958e3,a43e7a0f -9.0.0-rc-2,665958e3,a43e7a0f -9.0.0-rc-1,665958e3,a43e7a0f -9.0.0-milestone-9,665958e3,a43e7a0f -9.0.0-milestone-8,665958e3,a43e7a0f -9.0.0-milestone-10,665958e3,a43e7a0f -9.0-milestone-2,665958e3,a43e7a0f +9.0.0,47c95633,a43e7a0f +9.0.0-rc-4,47c95633,a43e7a0f +9.0.0-rc-3,47c95633,a43e7a0f +9.0.0-rc-2,47c95633,a43e7a0f +9.0.0-rc-1,47c95633,a43e7a0f +9.0.0-milestone-9,47c95633,a43e7a0f +9.0.0-milestone-8,47c95633,a43e7a0f +9.0.0-milestone-10,47c95633,a43e7a0f +9.0-milestone-2,47c95633,a43e7a0f 9.0-milestone-1,611e634e,5e608638 -9.0-milestone-6,665958e3,a43e7a0f -9.0-milestone-5,665958e3,a43e7a0f -9.0-milestone-4,665958e3,a43e7a0f -9.0-milestone-3,665958e3,a43e7a0f -9.0-milestone-7,665958e3,a43e7a0f -8.14.4,b67a59d5,a43e7a0f -8.14.3,b67a59d5,a43e7a0f -8.14.2,b67a59d5,a43e7a0f -8.14.1,b67a59d5,a43e7a0f -8.14,b67a59d5,a43e7a0f -8.14-rc-3,b67a59d5,a43e7a0f -8.14-rc-2,b67a59d5,a43e7a0f -8.14-rc-1,b67a59d5,a43e7a0f +9.0-milestone-6,47c95633,a43e7a0f +9.0-milestone-5,47c95633,a43e7a0f +9.0-milestone-4,47c95633,a43e7a0f +9.0-milestone-3,47c95633,a43e7a0f +9.0-milestone-7,47c95633,a43e7a0f +8.14.4,8e765725,a43e7a0f +8.14.3,8e765725,a43e7a0f +8.14.2,8e765725,a43e7a0f +8.14.1,8e765725,a43e7a0f +8.14,8e765725,a43e7a0f +8.14-rc-3,8e765725,a43e7a0f +8.14-rc-2,8e765725,a43e7a0f +8.14-rc-1,8e765725,a43e7a0f 8.14-milestone-5,611e634e,5e608638 8.14-milestone-7,611e634e,5e608638 8.14-milestone-8,611e634e,5e608638 diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/internal/GradleWrapperScriptDownloader.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/internal/GradleWrapperScriptDownloader.java index eb4dabd1872..0094f545abb 100644 --- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/internal/GradleWrapperScriptDownloader.java +++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/internal/GradleWrapperScriptDownloader.java @@ -209,7 +209,7 @@ private static Map unixBindings(String gradleVersion) { binding.put("entryPointArgs", "-jar \"$APP_HOME/gradle/wrapper/gradle-wrapper.jar\""); binding.put("mainClassName", ""); } else if (current.compareTo(GRADLE_9_0_M_2) >= 0) { - binding.put("classpath", "\"\\\\\\\"\\\\\\\"\""); + binding.put("classpath", ""); binding.put("entryPointArgs", "-jar \"$APP_HOME/gradle/wrapper/gradle-wrapper.jar\""); binding.put("mainClassName", ""); } else if (current.compareTo(GRADLE_9_0_M_1) >= 0) { @@ -217,7 +217,7 @@ private static Map unixBindings(String gradleVersion) { binding.put("entryPointArgs", ""); binding.put("mainClassName", "org.gradle.wrapper.GradleWrapperMain"); } else if (current.compareTo(GRADLE_8_14_RC_1) >= 0) { - binding.put("classpath", "\"\\\\\\\\\\\"\\\\\\\\\\\"\""); + binding.put("classpath", ""); binding.put("entryPointArgs", "-jar \"$APP_HOME/gradle/wrapper/gradle-wrapper.jar\""); binding.put("mainClassName", ""); } else if (current.compareTo(GRADLE_1_0_M_8) >= 0) { @@ -281,8 +281,7 @@ private static Map defaultBindings() { private static String renderTemplate(String source, Map bindings, String lineSeparator) throws IOException, ClassNotFoundException { SimpleTemplateEngine engine = new SimpleTemplateEngine(); return engine.createTemplate(source).make(new HashMap<>(bindings)).toString() - .replaceAll("\\R", lineSeparator) - .replace("CLASSPATH=\"\\\\\\\\\\\"\\\\\\\\\\\"", "CLASSPATH=\"\\\\\\\"\\\\\\\""); + .replaceAll("\\R", lineSeparator); } private static String hash(String text) { diff --git a/rewrite-gradle/src/test/resources/org/openrewrite/gradle/gradlew-8.14 b/rewrite-gradle/src/test/resources/org/openrewrite/gradle/gradlew-8.14 index 23d15a93670..2fedc1a0b7d 100644 --- a/rewrite-gradle/src/test/resources/org/openrewrite/gradle/gradlew-8.14 +++ b/rewrite-gradle/src/test/resources/org/openrewrite/gradle/gradlew-8.14 @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" +CLASSPATH= # Determine the Java command to use to start the JVM.