Fix Gradle plugin tests

mhalbritter · Mar 4, 2024 · a8d7ef1 · a8d7ef1
1 parent 10a57ad
commit a8d7ef1
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 40 deletions.
diff --git a/...rg/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-customLayers.gradle b/...rg/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-customLayers.gradle
@@ -38,12 +38,12 @@ dependencies {
 
 task listLayers(type: JavaExec) {
 	classpath = bootJar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "list"
+	systemProperties = [ "jarmode": "tools" ]
+	args "list-layers"
 }
 
 task extractLayers(type: JavaExec) {
 	classpath = bootJar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "extract"
+	systemProperties = [ "jarmode": "tools" ]
+	args "extract", "--layers", "--launcher"
 }
diff --git a/.../springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-implicitLayers.gradle b/.../springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-implicitLayers.gradle
@@ -21,12 +21,12 @@ dependencies {
 
 task listLayers(type: JavaExec) {
 	classpath = bootJar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "list"
+	systemProperties = [ "jarmode": "tools" ]
+	args "list-layers"
 }
 
 task extractLayers(type: JavaExec) {
 	classpath = bootJar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "extract"
+	systemProperties = [ "jarmode": "tools" ]
+	args "extract", "--layers", "--launcher"
 }
diff --git a/...ework/boot/gradle/tasks/bundling/BootJarIntegrationTests-layersWithCustomSourceSet.gradle b/...ework/boot/gradle/tasks/bundling/BootJarIntegrationTests-layersWithCustomSourceSet.gradle
@@ -24,12 +24,12 @@ dependencies {
 
 task listLayers(type: JavaExec) {
 	classpath = bootJar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "list"
+	systemProperties = [ "jarmode": "tools" ]
+	args "list-layers"
 }
 
 task extractLayers(type: JavaExec) {
 	classpath = bootJar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "extract"
+	systemProperties = [ "jarmode": "tools" ]
+	args "extract", "--layers", "--launcher"
 }
diff --git a/...amework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleCustomLayers.gradle b/...amework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleCustomLayers.gradle
@@ -55,12 +55,12 @@ dependencies {
 
 task listLayers(type: JavaExec) {
 	classpath = bootJar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "list"
+	systemProperties = [ "jarmode": "tools" ]
+	args "list-layers"
 }
 
 task extractLayers(type: JavaExec) {
 	classpath = bootJar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "extract"
+	systemProperties = [ "jarmode": "tools" ]
+	args "extract", "--layers", "--launcher"
 }
diff --git a/...ework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleImplicitLayers.gradle b/...ework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleImplicitLayers.gradle
@@ -33,12 +33,12 @@ dependencies {
 
 task listLayers(type: JavaExec) {
 	classpath = bootJar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "list"
+	systemProperties = [ "jarmode": "tools" ]
+	args "list-layers"
 }
 
 task extractLayers(type: JavaExec) {
 	classpath = bootJar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "extract"
+	systemProperties = [ "jarmode": "tools" ]
+	args "extract", "--layers", "--launcher"
 }
diff --git a/...rg/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-customLayers.gradle b/...rg/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-customLayers.gradle
@@ -39,12 +39,12 @@ dependencies {
 
 task listLayers(type: JavaExec) {
 	classpath = bootWar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "list"
+	systemProperties = [ "jarmode": "tools" ]
+	args "list-layers"
 }
 
 task extractLayers(type: JavaExec) {
 	classpath = bootWar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "extract"
+	systemProperties = [ "jarmode": "tools" ]
+	args "extract", "--layers", "--launcher"
 }
diff --git a/.../springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-implicitLayers.gradle b/.../springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-implicitLayers.gradle
@@ -22,12 +22,12 @@ dependencies {
 
 task listLayers(type: JavaExec) {
 	classpath = bootWar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "list"
+	systemProperties = [ "jarmode": "tools" ]
+	args "list-layers"
 }
 
 task extractLayers(type: JavaExec) {
 	classpath = bootWar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "extract"
+	systemProperties = [ "jarmode": "tools" ]
+	args "extract", "--layers", "--launcher"
 }
diff --git a/...ework/boot/gradle/tasks/bundling/BootWarIntegrationTests-layersWithCustomSourceSet.gradle b/...ework/boot/gradle/tasks/bundling/BootWarIntegrationTests-layersWithCustomSourceSet.gradle
@@ -25,12 +25,12 @@ dependencies {
 
 task listLayers(type: JavaExec) {
 	classpath = bootWar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "list"
+	systemProperties = [ "jarmode": "tools" ]
+	args "list-layers"
 }
 
 task extractLayers(type: JavaExec) {
 	classpath = bootWar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "extract"
+	systemProperties = [ "jarmode": "tools" ]
+	args "extract", "--layers", "--launcher"
 }
diff --git a/...amework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleCustomLayers.gradle b/...amework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleCustomLayers.gradle
@@ -56,12 +56,12 @@ dependencies {
 
 task listLayers(type: JavaExec) {
 	classpath = bootWar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "list"
+	systemProperties = [ "jarmode": "tools" ]
+	args "list-layers"
 }
 
 task extractLayers(type: JavaExec) {
 	classpath = bootWar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "extract"
+	systemProperties = [ "jarmode": "tools" ]
+	args "extract", "--layers", "--launcher"
 }
diff --git a/...ework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleImplicitLayers.gradle b/...ework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleImplicitLayers.gradle
@@ -34,12 +34,12 @@ dependencies {
 
 task listLayers(type: JavaExec) {
 	classpath = bootWar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "list"
+	systemProperties = [ "jarmode": "tools" ]
+	args "list-layers"
 }
 
 task extractLayers(type: JavaExec) {
 	classpath = bootWar.outputs.files
-	systemProperties = [ "jarmode": "layertools" ]
-	args "extract"
+	systemProperties = [ "jarmode": "tools" ]
+	args "extract", "--layers", "--launcher"
 }