Fixes #4507 - Cleanup use of piranha.version property in tests (#4520)

piranhacloud · Jan 12, 2025 · a80ff9c · a80ff9c
1 parent 8a22f5d
commit a80ff9c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 13 deletions.
diff --git a/test/coreprofile/arquillian/pom.xml b/test/coreprofile/arquillian/pom.xml
@@ -14,8 +14,6 @@
     <packaging>war</packaging>
     <name>Piranha - Test - Core Profile - Testing with JUnit 5 and Arquillian</name>
     <properties>
-        <!-- dependencies -->
-        <piranha.version>${project.version}</piranha.version>
         <!-- other -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -28,7 +26,7 @@
         <dependency>
             <groupId>cloud.piranha.arquillian</groupId>
             <artifactId>piranha-arquillian-managed</artifactId>
-            <version>${piranha.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/test/coreprofile/json/pom.xml b/test/coreprofile/json/pom.xml
@@ -15,7 +15,6 @@
     <name>Piranha - Test - Core Profile - Create a JSON temperature service</name>
     <properties>
         <!-- other -->
-        <piranha.version>${project.version}</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -46,7 +45,7 @@
             <plugin>
                 <groupId>cloud.piranha.maven</groupId>
                 <artifactId>piranha-maven-plugin</artifactId>
-                <version>${piranha.version}</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>pre-integration-test</id>

diff --git a/test/coreprofile/no_servlet_class/pom.xml b/test/coreprofile/no_servlet_class/pom.xml
@@ -15,7 +15,6 @@
     <name>Piranha - Test - Core Profile - No servlet-class specified</name>
     <properties>
         <!-- other -->
-        <piranha.version>${project.version}</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -46,7 +45,7 @@
             <plugin>
                 <groupId>cloud.piranha.maven</groupId>
                 <artifactId>piranha-maven-plugin</artifactId>
-                <version>${piranha.version}</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>pre-integration-test</id>

diff --git a/test/coreprofile/rest/pom.xml b/test/coreprofile/rest/pom.xml
@@ -12,7 +12,6 @@
     <name>Piranha - Test - Core Profile - REST</name>
     <properties>
         <!-- other -->
-        <piranha.version>${project.version}</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -35,7 +34,7 @@
             <plugin>
                 <groupId>cloud.piranha.maven</groupId>
                 <artifactId>piranha-maven-plugin</artifactId>
-                <version>${piranha.version}</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>pre-integration-test</id>

diff --git a/test/micro/helloworld/pom.xml b/test/micro/helloworld/pom.xml
@@ -18,7 +18,6 @@
         <!-- other -->
         <java.version>21</java.version>
         <piranha.distribution>micro</piranha.distribution>
-        <piranha.version>${project.version}</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- plugins -->
     </properties>
@@ -29,7 +28,7 @@
             <plugin>
                 <groupId>cloud.piranha.maven</groupId>
                 <artifactId>piranha-maven-plugin</artifactId>
-                <version>${piranha.version}</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>pre-integration-test</id>

diff --git a/test/servlet/helloworld/pom.xml b/test/servlet/helloworld/pom.xml
@@ -16,7 +16,6 @@
     <properties>
         <!-- other -->
         <piranha.distribution>servlet</piranha.distribution>
-        <piranha.version>${project.version}</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -43,7 +42,7 @@
             <plugin>
                 <groupId>cloud.piranha.maven</groupId>
                 <artifactId>piranha-maven-plugin</artifactId>
-                <version>${piranha.version}</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>pre-integration-test</id>