Repository: struts-archetypes Updated Branches: refs/heads/master a88a347aa -> 049f0d41d
Drops useless declaration of Log4j2 - it's already included in Struts Project: http://git-wip-us.apache.org/repos/asf/struts-archetypes/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-archetypes/commit/8237fcc6 Tree: http://git-wip-us.apache.org/repos/asf/struts-archetypes/tree/8237fcc6 Diff: http://git-wip-us.apache.org/repos/asf/struts-archetypes/diff/8237fcc6 Branch: refs/heads/master Commit: 8237fcc60c3a72c4148cdcbfd6b4e9fdd36b686c Parents: a88a347 Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Thu Nov 3 11:38:45 2016 +0100 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Thu Nov 3 11:38:45 2016 +0100 ---------------------------------------------------------------------- .../src/main/resources/archetype-resources/pom.xml | 9 --------- .../src/main/resources/archetype-resources/pom.xml | 7 ------- .../src/main/resources/archetype-resources/pom.xml | 7 ------- .../src/main/resources/archetype-resources/pom.xml | 6 ------ .../src/main/resources/archetype-resources/pom.xml | 9 +-------- 5 files changed, 1 insertion(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/8237fcc6/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml index 70c58c4..8559f18 100644 --- a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml +++ b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml @@ -10,7 +10,6 @@ <properties> <struts2.version>${project.version}</struts2.version> - <log4j2.version>${log4j2.version}</log4j2.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -48,20 +47,12 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>\${log4j2.version}</version> - </dependency> - - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.5</version> <scope>test</scope> </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/8237fcc6/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml index 4a1bd24..b432767 100644 --- a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml +++ b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml @@ -10,7 +10,6 @@ <properties> <struts2.version>${project.version}</struts2.version> - <log4j2.version>${log4j2.version}</log4j2.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -36,12 +35,6 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>\${log4j2.version}</version> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.5</version> http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/8237fcc6/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml index 9bca7cc..b7b715a 100644 --- a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml +++ b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml @@ -10,7 +10,6 @@ <properties> <struts2.version>${project.version}</struts2.version> - <log4j2.version>${log4j2.version}</log4j2.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -42,12 +41,6 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>\${log4j2.version}</version> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.5</version> http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/8237fcc6/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml index 49d9e88..e1826d9 100644 --- a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml +++ b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml @@ -92,12 +92,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>\${log4j2.version}</version> - </dependency> - </dependencies> <build> http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/8237fcc6/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml index 3b79422..b90f235 100644 --- a/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml +++ b/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml @@ -71,13 +71,6 @@ <version>1.3</version> </dependency> - <!-- Logging --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>\${log4j2.version}</version> - </dependency> - <!-- Dwr --> <dependency> <groupId>uk.ltd.getahead</groupId> @@ -85,7 +78,7 @@ <version>1.1-beta-3</version> </dependency> </dependencies> - + <build> <finalName>${artifactId}</finalName> <plugins>