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 2015/05/26 18:39:42 UTC
struts git commit: Cleans up after dropping deprecated plugins
Repository: struts
Updated Branches:
refs/heads/master c5cf86a41 -> 8c2b321aa
Cleans up after dropping deprecated plugins
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8c2b321a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8c2b321a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8c2b321a
Branch: refs/heads/master
Commit: 8c2b321aa042d9f5d4210d03ad4d8c8ec044f162
Parents: c5cf86a
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue May 26 18:39:34 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue May 26 18:39:34 2015 +0200
----------------------------------------------------------------------
.gitignore | 6 +-----
assembly/pom.xml | 21 ---------------------
assembly/src/main/assembly/all.xml | 16 ----------------
assembly/src/main/assembly/docs.xml | 16 ----------------
bom/pom.xml | 20 --------------------
pom.xml | 20 --------------------
6 files changed, 1 insertion(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/8c2b321a/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index e95318a..a1e20c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,10 +31,8 @@ archetypes/struts2-archetype-starter/target
archetypes/target
plugins/convention/target
plugins/embeddedjsp/target
-plugins/dojo/target
plugins/osgi/target
plugins/cdi/target
-plugins/codebehind/target
plugins/spring/target
plugins/jfreechart/target
apps/rest-showcase/target
@@ -49,13 +47,11 @@ apps/target
bundles/admin/target
plugins/config-browser/target
plugins/jasperreports/target
-plugins/jsf/target
plugins/json/target
plugins/portlet-tiles/target
plugins/portlet/target
plugins/sitegraph/target
plugins/sitemesh/target
-plugins/struts1/target
plugins/tiles3/target
plugins/javatemplates/target
bundles/demo/target
@@ -70,4 +66,4 @@ plugins/tiles/target
bundles/target
plugins/target
target
-plugins/testng/test-output
\ No newline at end of file
+plugins/testng/test-output
http://git-wip-us.apache.org/repos/asf/struts/blob/8c2b321a/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 45329d6..e971112 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -150,11 +150,6 @@
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-codebehind-plugin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-convention-plugin</artifactId>
</dependency>
@@ -170,11 +165,6 @@
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-dojo-plugin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-dwr-plugin</artifactId>
</dependency>
@@ -190,11 +180,6 @@
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-jsf-plugin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
</dependency>
@@ -231,12 +216,6 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-struts1-plugin</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/8c2b321a/assembly/src/main/assembly/all.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index acf9c98..9e52856 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -133,10 +133,6 @@
<outputDirectory>docs/struts2-plugins/struts2-cdi-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/codebehind/target/apidocs</directory>
- <outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../plugins/config-browser/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin/apidocs</outputDirectory>
</fileSet>
@@ -145,10 +141,6 @@
<outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/dojo/target/apidocs</directory>
- <outputDirectory>docs/struts2-plugins/struts2-dojo-plugin/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../plugins/dwr/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-dwr-plugin/apidocs</outputDirectory>
</fileSet>
@@ -173,10 +165,6 @@
<outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/jsf/target/apidocs</directory>
- <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../plugins/json/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-json-plugin/apidocs</outputDirectory>
</fileSet>
@@ -225,10 +213,6 @@
<outputDirectory>docs/struts2-plugins/struts2-spring-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/struts1/target/apidocs</directory>
- <outputDirectory>docs/struts2-plugins/struts2-struts1-plugin/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../plugins/testng/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-testng-plugin/apidocs</outputDirectory>
</fileSet>
http://git-wip-us.apache.org/repos/asf/struts/blob/8c2b321a/assembly/src/main/assembly/docs.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index d5d2f7b..1f349ba 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -57,10 +57,6 @@
<outputDirectory>docs/struts2-plugins/struts2-cdi-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/codebehind/target/apidocs</directory>
- <outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../plugins/config-browser/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin/apidocs</outputDirectory>
</fileSet>
@@ -69,10 +65,6 @@
<outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/dojo/target/apidocs</directory>
- <outputDirectory>docs/struts2-plugins/struts2-dojo-plugin/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../plugins/dwr/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-dwr-plugin/apidocs</outputDirectory>
</fileSet>
@@ -97,10 +89,6 @@
<outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/jsf/target/apidocs</directory>
- <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../plugins/json/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-json-plugin/apidocs</outputDirectory>
</fileSet>
@@ -149,10 +137,6 @@
<outputDirectory>docs/struts2-plugins/struts2-spring-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/struts1/target/apidocs</directory>
- <outputDirectory>docs/struts2-plugins/struts2-struts1-plugin/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../plugins/testng/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-testng-plugin/apidocs</outputDirectory>
</fileSet>
http://git-wip-us.apache.org/repos/asf/struts/blob/8c2b321a/bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/pom.xml b/bom/pom.xml
index bd234e4..7e4bed3 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -55,21 +55,11 @@
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-dojo-plugin</artifactId>
- <version>${struts-version.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-cdi-plugin</artifactId>
<version>${struts-version.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-codebehind-plugin</artifactId>
- <version>${struts-version.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-convention-plugin</artifactId>
<version>${struts-version.version}</version>
</dependency>
@@ -105,11 +95,6 @@
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-jsf-plugin</artifactId>
- <version>${struts-version.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-jfreechart-plugin</artifactId>
<version>${struts-version.version}</version>
</dependency>
@@ -175,11 +160,6 @@
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-struts1-plugin</artifactId>
- <version>${struts-version.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-testng-plugin</artifactId>
<version>${struts-version.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/struts/blob/8c2b321a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b99e47e..487d418 100644
--- a/pom.xml
+++ b/pom.xml
@@ -412,11 +412,6 @@
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-codebehind-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-javatemplates-plugin</artifactId>
<version>${project.version}</version>
</dependency>
@@ -427,11 +422,6 @@
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-dojo-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-jasperreports-plugin</artifactId>
<version>${project.version}</version>
</dependency>
@@ -442,11 +432,6 @@
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-jsf-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-pell-multipart-plugin</artifactId>
<version>${project.version}</version>
</dependency>
@@ -472,11 +457,6 @@
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-struts1-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
<artifactId>struts2-testng-plugin</artifactId>
<version>${project.version}</version>
</dependency>