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 2014/07/10 10:26:43 UTC
[1/2] git commit: Removes duplicated dependency
Repository: struts-examples
Updated Branches:
refs/heads/develop a405aa4f3 -> 1af364c59
Removes duplicated dependency
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/aa0d2625
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/aa0d2625
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/aa0d2625
Branch: refs/heads/develop
Commit: aa0d26251cb2f850d1b38ed54e29c5f849de9ef4
Parents: a405aa4
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Thu Jul 10 10:24:06 2014 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Thu Jul 10 10:24:06 2014 +0200
----------------------------------------------------------------------
themes_override/pom.xml | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/aa0d2625/themes_override/pom.xml
----------------------------------------------------------------------
diff --git a/themes_override/pom.xml b/themes_override/pom.xml
index 6a34507..102af8d 100644
--- a/themes_override/pom.xml
+++ b/themes_override/pom.xml
@@ -19,13 +19,6 @@
<packaging>war</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- <version>2.3.18-SNAPSHOT</version>
- </dependency>
- </dependencies>
<build>
<finalName>themes_override</finalName>
<plugins>
[2/2] git commit: Cleans up dependencies
Posted by lu...@apache.org.
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/1af364c5
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/1af364c5
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/1af364c5
Branch: refs/heads/develop
Commit: 1af364c5996247305e40581adf77038b02cf7007
Parents: aa0d262
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Thu Jul 10 10:25:54 2014 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Thu Jul 10 10:25:54 2014 +0200
----------------------------------------------------------------------
pom.xml | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1af364c5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fafd69d..9e9d737 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,13 +13,9 @@
</description>
<properties>
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<struts2.version>2.3.18-SNAPSHOT</struts2.version>
-
<log4j.version>1.2.17</log4j.version>
-
</properties>
<developers>
@@ -61,20 +57,12 @@
<module>themes_override</module>
</modules>
-
-
<dependencies>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>${struts2.version}</version>
- <exclusions>
- <exclusion> <!-- exclude the transitive dependency to older version of commons-fileupload due to security issue -->
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -82,21 +70,11 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
-
- <dependency> <!--explicitly include dependency on new version of commons-fileupload that fixes security issue-->
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.3.1</version>
- </dependency>
</dependencies>
-
-
<build>
-
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -108,5 +86,7 @@
</configuration>
</plugin>
</plugins>
+
</build>
+
</project>