Fix smoke test for Java 21

nikita-tkachenko-datadog · nikita-tkachenko-datadog · commit 4c2020bb5599 · 2024-03-15T16:10:59.000+01:00
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl
@@ -37,7 +37,7 @@
       "test.toolchain" : ${content_meta_test_toolchain},
       "test.itr.tests_skipping.type" : "test",
       "test.command" : "mvn -B test",
-      "test.framework_version" : "2.3.0-groovy-4.0",
+      "test.framework_version" : "2.4.0-M2-groovy-4.0",
       "test.framework" : "spock"
     }
   }
@@ -76,7 +76,7 @@
       "test.itr.tests_skipping.type" : "test",
       "runtime.version" : ${content_meta_runtime_version},
       "test.command" : "mvn -B test",
-      "test.framework_version" : "2.3.0-groovy-4.0",
+      "test.framework_version" : "2.4.0-M2-groovy-4.0",
       "test.framework" : "spock",
       "test.itr.tests_skipping.enabled" : "true"
     }
@@ -118,7 +118,7 @@
       "env" : "integration-test",
       "runtime.vendor" : ${content_meta_runtime_vendor},
       "component" : "junit",
-      "test.framework_version" : "2.3.0-groovy-4.0",
+      "test.framework_version" : "2.4.0-M2-groovy-4.0",
       "test.framework" : "spock"
     }
   }
@@ -164,8 +164,8 @@
       "env" : "integration-test",
       "runtime.vendor" : ${content_meta_runtime_vendor},
       "component" : "junit",
-      "test.framework_version" : "2.3.0-groovy-4.0",
+      "test.framework_version" : "2.4.0-M2-groovy-4.0",
       "test.framework" : "spock"
     }
   }
-} ]
+} ]
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml
@@ -9,8 +9,6 @@
   <name>Maven Smoke Tests Project</name>
 
   <properties>
-    <maven.compiler.source>8</maven.compiler.source>
-    <maven.compiler.target>8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -52,7 +50,7 @@
       <dependency>
         <groupId>org.spockframework</groupId>
         <artifactId>spock-bom</artifactId>
-        <version>2.3-groovy-4.0</version>
+        <version>2.4-M2-groovy-4.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -82,7 +80,6 @@
       <plugin>
         <groupId>org.codehaus.gmavenplus</groupId>
         <artifactId>gmavenplus-plugin</artifactId>
-        <version>3.0.2</version>
         <executions>
           <execution>
             <goals>

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`"test.toolchain" : ${content_meta_test_toolchain},`
`38`	`38`	`"test.itr.tests_skipping.type" : "test",`
`39`	`39`	`"test.command" : "mvn -B test",`
`40`		`- "test.framework_version" : "2.3.0-groovy-4.0",`
	`40`	`+ "test.framework_version" : "2.4.0-M2-groovy-4.0",`
`41`	`41`	`"test.framework" : "spock"`
`42`	`42`	`}`
`43`	`43`	`}`
`@@ -76,7 +76,7 @@`
`76`	`76`	`"test.itr.tests_skipping.type" : "test",`
`77`	`77`	`"runtime.version" : ${content_meta_runtime_version},`
`78`	`78`	`"test.command" : "mvn -B test",`
`79`		`- "test.framework_version" : "2.3.0-groovy-4.0",`
	`79`	`+ "test.framework_version" : "2.4.0-M2-groovy-4.0",`
`80`	`80`	`"test.framework" : "spock",`
`81`	`81`	`"test.itr.tests_skipping.enabled" : "true"`
`82`	`82`	`}`
`@@ -118,7 +118,7 @@`
`118`	`118`	`"env" : "integration-test",`
`119`	`119`	`"runtime.vendor" : ${content_meta_runtime_vendor},`
`120`	`120`	`"component" : "junit",`
`121`		`- "test.framework_version" : "2.3.0-groovy-4.0",`
	`121`	`+ "test.framework_version" : "2.4.0-M2-groovy-4.0",`
`122`	`122`	`"test.framework" : "spock"`
`123`	`123`	`}`
`124`	`124`	`}`
`@@ -164,8 +164,8 @@`
`164`	`164`	`"env" : "integration-test",`
`165`	`165`	`"runtime.vendor" : ${content_meta_runtime_vendor},`
`166`	`166`	`"component" : "junit",`
`167`		`- "test.framework_version" : "2.3.0-groovy-4.0",`
	`167`	`+ "test.framework_version" : "2.4.0-M2-groovy-4.0",`
`168`	`168`	`"test.framework" : "spock"`
`169`	`169`	`}`
`170`	`170`	`}`
`171`		`-} ]`
	`171`	`+} ]`