You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/01/02 09:52:51 UTC

struts-examples git commit: Cleans up dependencies

Repository: struts-examples
Updated Branches:
  refs/heads/master 06ddc54a6 -> bf1f646fd


Cleans up dependencies


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

Branch: refs/heads/master
Commit: bf1f646fda096b2f21a27023164f949f824a07a2
Parents: 06ddc54
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Mon Jan 2 10:52:43 2017 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Mon Jan 2 10:52:43 2017 +0100

----------------------------------------------------------------------
 blank/pom.xml           |  6 ------
 json/pom.xml            |  6 ------
 pom.xml                 |  1 +
 rest-angular/pom.xml    | 16 ----------------
 type-conversion/pom.xml |  6 ------
 unknown-handler/pom.xml |  6 ------
 wildcard-regex/pom.xml  | 24 ------------------------
 7 files changed, 1 insertion(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/bf1f646f/blank/pom.xml
----------------------------------------------------------------------
diff --git a/blank/pom.xml b/blank/pom.xml
index c1714f7..d1f4acf 100644
--- a/blank/pom.xml
+++ b/blank/pom.xml
@@ -36,12 +36,6 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-            <version>${struts2.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <version>3.1.0</version>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/bf1f646f/json/pom.xml
----------------------------------------------------------------------
diff --git a/json/pom.xml b/json/pom.xml
index d217480..872939e 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -22,12 +22,6 @@
 
     <dependency>
       <groupId>org.apache.struts</groupId>
-      <artifactId>struts2-core</artifactId>
-      <version>${struts2.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.struts</groupId>
       <artifactId>struts2-config-browser-plugin</artifactId>
       <version>${struts2.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/bf1f646f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9232e41..8d3b790 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/bf1f646f/rest-angular/pom.xml
----------------------------------------------------------------------
diff --git a/rest-angular/pom.xml b/rest-angular/pom.xml
index c000776..e5f5edc 100644
--- a/rest-angular/pom.xml
+++ b/rest-angular/pom.xml
@@ -22,22 +22,6 @@
 
         <dependency>
             <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-            <version>${struts2.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>asm</artifactId>
-                    <groupId>asm</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>asm-commons</artifactId>
-                    <groupId>asm</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
             <version>${struts2.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/bf1f646f/type-conversion/pom.xml
----------------------------------------------------------------------
diff --git a/type-conversion/pom.xml b/type-conversion/pom.xml
index 8939ee2..7b862ee 100644
--- a/type-conversion/pom.xml
+++ b/type-conversion/pom.xml
@@ -20,12 +20,6 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.struts</groupId>
-      <artifactId>struts2-core</artifactId>
-      <version>${struts2.version}</version>
-    </dependency>
-
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/bf1f646f/unknown-handler/pom.xml
----------------------------------------------------------------------
diff --git a/unknown-handler/pom.xml b/unknown-handler/pom.xml
index 2a9ba28..07ce7be 100644
--- a/unknown-handler/pom.xml
+++ b/unknown-handler/pom.xml
@@ -22,12 +22,6 @@
 
     <dependency>
       <groupId>org.apache.struts</groupId>
-      <artifactId>struts2-core</artifactId>
-      <version>${struts2.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.struts</groupId>
       <artifactId>struts2-convention-plugin</artifactId>
       <version>${struts2.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/bf1f646f/wildcard-regex/pom.xml
----------------------------------------------------------------------
diff --git a/wildcard-regex/pom.xml b/wildcard-regex/pom.xml
index 794fd21..62a7fb7 100644
--- a/wildcard-regex/pom.xml
+++ b/wildcard-regex/pom.xml
@@ -18,30 +18,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.struts</groupId>
-      <artifactId>struts2-core</artifactId>
-      <version>${struts2.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.0</version>
-      <scope>provided</scope>
-    </dependency>
-
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>