Merge pull request #33742 from gsmet/avoid-absolute-paths

quarkusio · Jun 8, 2023 · adcaefc · adcaefc
2 parents 243fe20 + 8db2266
commit adcaefc
Show file tree

Hide file tree

Showing 135 changed files with 456 additions and 453 deletions.
diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml
@@ -320,6 +320,9 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>${version.resources.plugin}</version>
+                    <configuration>
+                        <escapeString>\</escapeString>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml
@@ -104,7 +104,7 @@
                 </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>
                   </systemPropertyVariables>

diff --git a/...kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml b/...kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml
@@ -104,7 +104,7 @@
                 </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>
                   </systemPropertyVariables>

diff --git a/...ubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml b/...ubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml
@@ -104,7 +104,7 @@
                 </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>
                   </systemPropertyVariables>

diff --git a/...gration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml b/...gration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
@@ -104,7 +104,7 @@
                 </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>
                   </systemPropertyVariables>

diff --git a/...ubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml b/...ubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml
@@ -105,7 +105,7 @@
                 </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>
                   </systemPropertyVariables>

diff --git a/...ration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml b/...ration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml
@@ -106,7 +106,7 @@
                 </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>
                   </systemPropertyVariables>

diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml
@@ -102,7 +102,7 @@
                 </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>
                   </systemPropertyVariables>

diff --git a/...gration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml b/...gration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
@@ -108,7 +108,7 @@
                 </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>
                   </systemPropertyVariables>

diff --git a/...ation-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml b/...ation-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
@@ -104,7 +104,7 @@
                 </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>
                   </systemPropertyVariables>

diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
@@ -100,7 +100,7 @@
                 </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>
                   </systemPropertyVariables>

diff --git a/...resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/pom.xml b/...resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.acme</groupId>
             <artifactId>my-project-add-to-bom</artifactId>
-            <version>${project.version}</version>
+            <version>\${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -40,7 +40,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>\${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

diff --git a/...st/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/runtime/pom.xml b/...st/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/runtime/pom.xml
@@ -29,15 +29,15 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-extension-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>\${quarkus.version}</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>extension-descriptor</goal>
                         </goals>
                         <phase>compile</phase>
                         <configuration>
-                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
+                            <deployment>\${project.groupId}:\${project.artifactId}-deployment:\${project.version}
                             </deployment>
                         </configuration>
                     </execution>
@@ -51,7 +51,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>\${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

diff --git a/...ts/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/bom/pom.xml b/...ts/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/bom/pom.xml
@@ -16,7 +16,7 @@
             <dependency>
                 <groupId>org.acme</groupId>
                 <artifactId>my-project-add-to-bom</artifactId>
-                <version>${project.version}</version>
+                <version>\${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.example</groupId>
@@ -26,12 +26,12 @@
             <dependency>
                 <groupId>org.acme</groupId>
                 <artifactId>acme-add-to-bom</artifactId>
-                <version>${acme.version}</version>
+                <version>\${acme.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.acme</groupId>
                 <artifactId>my-project-add-to-bom-deployment</artifactId>
-                <version>${project.version}</version>
+                <version>\${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/...-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/pom.xml b/...-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/pom.xml
@@ -22,7 +22,7 @@
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bom</artifactId>
-                <version>${quarkus.version}</version>
+                <version>\${quarkus.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -34,7 +34,7 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${compiler-plugin.version}</version>
+                    <version>\${compiler-plugin.version}</version>
                 </plugin>
             </plugins>
         </pluginManagement>

diff --git a/...st/resources-filtered/expected/create-extension-pom-itest/integration-tests/itest/pom.xml b/...st/resources-filtered/expected/create-extension-pom-itest/integration-tests/itest/pom.xml
@@ -17,25 +17,25 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy</artifactId>
-            <version>${quarkus.version}</version>
+            <version>\${quarkus.version}</version>
         </dependency>
         <dependency>
             <groupId>org.acme</groupId>
             <artifactId>my-project-itest</artifactId>
-            <version>${project.version}</version>
+            <version>\${project.version}</version>
         </dependency>
 
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
-            <version>${quarkus.version}</version>
+            <version>\${quarkus.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>${rest-assured.version}</version>
+            <version>\${rest-assured.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -73,7 +73,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
+                            <skipTests>\${native.surefire.skip}</skipTests>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -87,9 +87,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/.../src/test/resources-filtered/expected/create-extension-pom-itest/itest/deployment/pom.xml b/.../src/test/resources-filtered/expected/create-extension-pom-itest/itest/deployment/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.acme</groupId>
             <artifactId>my-project-itest</artifactId>
-            <version>${project.version}</version>
+            <version>\${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -40,7 +40,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>\${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

diff --git a/...ven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/runtime/pom.xml b/...ven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/runtime/pom.xml
@@ -21,15 +21,15 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-extension-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>\${quarkus.version}</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>extension-descriptor</goal>
                         </goals>
                         <phase>compile</phase>
                         <configuration>
-                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
+                            <deployment>\${project.groupId}:\${project.artifactId}-deployment:\${project.version}
                             </deployment>
                         </configuration>
                     </execution>
@@ -43,7 +43,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>\${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

diff --git a/...ation-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/pom.xml b/...ation-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/pom.xml
@@ -22,7 +22,7 @@
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bom</artifactId>
-                <version>${quarkus.version}</version>
+                <version>\${quarkus.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -34,7 +34,7 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${compiler-plugin.version}</version>
+                    <version>\${compiler-plugin.version}</version>
                 </plugin>
             </plugins>
         </pluginManagement>

diff --git a/...urces-filtered/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml b/...urces-filtered/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.acme</groupId>
             <artifactId>my-project-minimal-extension</artifactId>
-            <version>${project.version}</version>
+            <version>\${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -40,7 +40,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>\${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

diff --git a/...esources-filtered/expected/create-extension-pom-minimal/minimal-extension/runtime/pom.xml b/...esources-filtered/expected/create-extension-pom-minimal/minimal-extension/runtime/pom.xml
@@ -21,15 +21,15 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-extension-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>\${quarkus.version}</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>extension-descriptor</goal>
                         </goals>
                         <phase>compile</phase>
                         <configuration>
-                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
+                            <deployment>\${project.groupId}:\${project.artifactId}-deployment:\${project.version}
                             </deployment>
                         </configuration>
                     </execution>
@@ -43,7 +43,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>\${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

diff --git a/...ion-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/pom.xml b/...ion-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/pom.xml
@@ -22,7 +22,7 @@
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bom</artifactId>
-                <version>${quarkus.version}</version>
+                <version>\${quarkus.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -34,7 +34,7 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${compiler-plugin.version}</version>
+                    <version>\${compiler-plugin.version}</version>
                 </plugin>
             </plugins>
         </pluginManagement>

diff --git a/...n/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/bom/pom.xml b/...n/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/bom/pom.xml
@@ -16,12 +16,12 @@
             <dependency>
                 <groupId>org.acme</groupId>
                 <artifactId>myproject-with-grand-parent</artifactId>
-                <version>${project.version}</version>
+                <version>\${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.acme</groupId>
                 <artifactId>myproject-with-grand-parent-deployment</artifactId>
-                <version>${project.version}</version>
+                <version>\${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/...maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/pom.xml b/...maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/pom.xml
@@ -22,7 +22,7 @@
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bom</artifactId>
-                <version>${quarkus.version}</version>
+                <version>\${quarkus.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -34,7 +34,7 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${compiler-plugin.version}</version>
+                    <version>\${compiler-plugin.version}</version>
                 </plugin>
             </plugins>
         </pluginManagement>