Update poms to take more advantage of filtering

quarkusio · Aug 7, 2023 · b74fb10 · b74fb10
1 parent 15b9050
commit b74fb10
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/...s/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml b/...s/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.acme</groupId>
   <artifactId>project-using-test-template-from-extension</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>999-SNAPSHOT</version>
   <properties>
     <compiler-plugin.version>${compiler-plugin.version}</compiler-plugin.version>
     <failsafe.useModulePath>false</failsafe.useModulePath>
     <quarkus.bom.artifact-id>quarkus-bom</quarkus.bom.artifact-id>
     <maven.compiler.release>11</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
+    <surefire-plugin.version>${surefire-plugin.version}</surefire-plugin.version>
     <quarkus.version>@project.version</quarkus.version>
   </properties>
   <dependencyManagement>
@@ -69,7 +69,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>${compiler-plugin.version}</version>
+        <version>\${compiler-plugin.version}</version>
         <configuration>
           <compilerArgs>
             <arg>-parameters</arg>
@@ -78,11 +78,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire-plugin.version}</version>
+        <version>\${surefire-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-            <maven.home>${maven.home}</maven.home>
+            <maven.home>\${maven.home}</maven.home>
           </systemPropertyVariables>
         </configuration>
       </plugin>
@@ -100,7 +100,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>${surefire-plugin.version}</version>
+            <version>\${surefire-plugin.version}</version>
             <executions>
               <execution>
                 <goals>
@@ -109,9 +109,9 @@
                 </goals>
                 <configuration>
                   <systemPropertyVariables>
-                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                    <native.image.path>\${project.build.directory}/${project.build.finalName}-runner</native.image.path>
                     <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                    <maven.home>${maven.home}</maven.home>
+                    <maven.home>\${maven.home}</maven.home>
                   </systemPropertyVariables>
                 </configuration>
               </execution>

diff --git a/...tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml b/...tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml
@@ -13,8 +13,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.bom.artifact-id>quarkus-bom</quarkus.bom.artifact-id>
-    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
-    <quarkus.version>999-SNAPSHOT</quarkus.version>
+    <surefire-plugin.version>${surefire-plugin.version}</surefire-plugin.version>
+    <quarkus.version>@project.version</quarkus.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -67,7 +67,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>${compiler-plugin.version}</version>
+        <version>\${compiler-plugin.version}</version>
         <configuration>
           <compilerArgs>
             <arg>-parameters</arg>
@@ -76,12 +76,12 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire-plugin.version}</version>
+        <version>\${surefire-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
             <!--suppress UnresolvedMavenProperty -->
-            <maven.home>${maven.home}</maven.home>
+            <maven.home>\${maven.home}</maven.home>
           </systemPropertyVariables>
         </configuration>
       </plugin>
@@ -99,7 +99,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>${surefire-plugin.version}</version>
+            <version>\${surefire-plugin.version}</version>
             <executions>
               <execution>
                 <goals>
@@ -108,10 +108,10 @@
                 </goals>
                 <configuration>
                   <systemPropertyVariables>
-                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                    <native.image.path>\${project.build.directory}/\${project.build.finalName}-runner</native.image.path>
                     <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                     <!--suppress UnresolvedMavenProperty -->
-                    <maven.home>${maven.home}</maven.home>
+                    <maven.home>\${maven.home}</maven.home>
                   </systemPropertyVariables>
                 </configuration>
               </execution>

diff --git a/...s/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml b/...s/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml
@@ -4,16 +4,16 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.acme</groupId>
   <artifactId>project-using-test-template-from-extension</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>999-SNAPSHOT</version>
   <properties>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
     <failsafe.useModulePath>false</failsafe.useModulePath>
     <quarkus.bom.artifact-id>quarkus-bom</quarkus.bom.artifact-id>
-    <maven.compiler.release>17</maven.compiler.release>
+    <maven.compiler.release>11</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
-    <quarkus.version>999-SNAPSHOT</quarkus.version>
+    <surefire-plugin.version>${surefire-plugin.version}</surefire-plugin.version>
+    <quarkus.version>@project.version</quarkus.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -69,7 +69,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>${compiler-plugin.version}</version>
+        <version>\${compiler-plugin.version}</version>
         <configuration>
           <compilerArgs>
             <arg>-parameters</arg>
@@ -78,11 +78,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire-plugin.version}</version>
+        <version>\${surefire-plugin.version}</version>
         <configuration>
           <systemPropertyVariables>
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-            <maven.home>${maven.home}</maven.home>
+            <maven.home>\${maven.home}</maven.home>
           </systemPropertyVariables>
         </configuration>
       </plugin>
@@ -100,7 +100,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>${surefire-plugin.version}</version>
+            <version>\${surefire-plugin.version}</version>
             <executions>
               <execution>
                 <goals>
@@ -111,7 +111,7 @@
                   <systemPropertyVariables>
                     <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
                     <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                    <maven.home>${maven.home}</maven.home>
+                    <maven.home>\${maven.home}</maven.home>
                   </systemPropertyVariables>
                 </configuration>
               </execution>