struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject [29/30] struts git commit: WW-4522 Support latest stable AngularJS version in maven angularjs archetype
Date Fri, 10 Jul 2015 15:37:16 GMT
WW-4522 Support latest stable AngularJS version in maven angularjs archetype

- Use the 3.1.0 version of servlet api in all archetypes


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/55e10bcf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/55e10bcf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/55e10bcf

Branch: refs/heads/master
Commit: 55e10bcf105bc5a74cdcdc86585e9abe2f46e973
Parents: 19a55a8
Author: Johannes Geppert <jogep@apache.org>
Authored: Fri Jul 10 17:16:32 2015 +0200
Committer: Johannes Geppert <jogep@apache.org>
Committed: Fri Jul 10 17:16:32 2015 +0200

----------------------------------------------------------------------
 .../main/resources/archetype-resources/pom.xml  | 14 +++--------
 .../main/resources/archetype-resources/pom.xml  |  4 ++--
 .../main/resources/archetype-resources/pom.xml  |  5 ++--
 .../main/resources/archetype-resources/pom.xml  | 24 +++++++++----------
 .../main/resources/archetype-resources/pom.xml  | 25 ++++++++++----------
 5 files changed, 33 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/55e10bcf/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
index 4f1eb84..358209c 100644
--- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
@@ -61,10 +61,11 @@
             <scope>test</scope>
         </dependency>
 
+
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -75,15 +76,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- The Servlet API mocks in Spring Framework 4.x only supports Servlet 3.0 and
higher.
-           This is only necessary in tests-->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/struts/blob/55e10bcf/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
index e6f625c..4a1bd24 100644
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
@@ -50,8 +50,8 @@
 
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/struts/blob/55e10bcf/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
index 5844509..9bca7cc 100644
--- a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
@@ -56,8 +56,8 @@
 
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -68,6 +68,7 @@
             <scope>provided</scope>
         </dependency>
 
+
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/struts/blob/55e10bcf/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
index 62a0e8f..49d9e88 100644
--- a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
@@ -71,19 +71,19 @@
         </dependency>
 
 		<!-- Servlet, Jsp, and Portlet API's -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
 
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>javax.portlet</groupId>

http://git-wip-us.apache.org/repos/asf/struts/blob/55e10bcf/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
index 6ab6329..3b79422 100644
--- a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
@@ -49,19 +49,20 @@
         </dependency>
 
 		<!-- Servlet & Jsp -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
+       <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
 
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
 
 		<!-- Jakarta Commons -->
 		<dependency>


Mime
View raw message