Rename maven struts version property for Struts implementation withou…

…t version number aws#471
jogep · Sep 17, 2022 · cd60e6d · cd60e6d
1 parent 72b0fd6
commit cd60e6d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/aws-serverless-java-container-struts/pom.xml b/aws-serverless-java-container-struts/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
     <properties>
-        <struts2.version>2.5.30</struts2.version>
+        <struts.version>2.5.30</struts.version>
     </properties>
 
     <dependencies>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${struts2.version}</version>
+            <version>${struts.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-io</groupId>
@@ -40,14 +40,14 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>${struts.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>${struts.version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/aws-serverless-struts-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-struts-archetype/src/main/resources/archetype-resources/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <struts2.version>2.5.30</struts2.version>
+        <struts.version>2.5.30</struts.version>
         <jackson.version>2.13.3</jackson.version>
         <junit.version>4.13.2</junit.version>
         <log4j.version>2.17.2</log4j.version>
@@ -37,25 +37,25 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>\${struts2.version}</version>
+            <version>\${struts.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-rest-plugin</artifactId>
-            <version>\${struts2.version}</version>
+            <version>\${struts.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-bean-validation-plugin</artifactId>
-            <version>\${struts2.version}</version>
+            <version>\${struts.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>\${struts2.version}</version>
+            <version>\${struts.version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/samples/struts/pet-store/pom.xml b/samples/struts/pet-store/pom.xml
@@ -26,7 +26,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <struts2.version>2.5.30</struts2.version>
+        <struts.version>2.5.30</struts.version>
         <jackson.version>2.13.3</jackson.version>
         <junit.version>4.13.2</junit.version>
         <log4j.version>2.17.2</log4j.version>
@@ -48,25 +48,25 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>${struts.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-rest-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>${struts.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-bean-validation-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>${struts.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>${struts.version}</version>
             <scope>test</scope>
         </dependency>