Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts into WW-4504

2026-08-06 15:17:00 +00:00 · 2015-05-26 19:14:34 +02:00
parent fe58d73f7a 8c2b321aa0
commit 73ef38d727
6 changed files with 3 additions and 100 deletions
@@ -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
+plugins/testng/test-output
@@ -148,11 +148,6 @@
            <artifactId>struts2-cdi-plugin</artifactId>
        </dependency>

-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-codebehind-plugin</artifactId>
-        </dependency>
-
        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-convention-plugin</artifactId>
@@ -168,11 +163,6 @@
            <artifactId>struts2-config-browser-plugin</artifactId>
        </dependency>

-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-dojo-plugin</artifactId>
-        </dependency>
-
        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-dwr-plugin</artifactId>
@@ -188,11 +178,6 @@
            <artifactId>struts2-jfreechart-plugin</artifactId>
        </dependency>

-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-jsf-plugin</artifactId>
-        </dependency>
-
        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-junit-plugin</artifactId>
@@ -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>
@@ -132,10 +132,6 @@
        <directory>../plugins/cdi/target/apidocs</directory>
        <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>
@@ -144,10 +140,6 @@
        <directory>../plugins/convention/target/apidocs</directory>
        <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>
@@ -172,10 +164,6 @@
        <directory>../plugins/jfreechart/target/apidocs</directory>
        <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>
@@ -224,10 +212,6 @@
        <directory>../plugins/spring/target/apidocs</directory>
        <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>
@@ -56,10 +56,6 @@
            <directory>../plugins/cdi/target/apidocs</directory>
            <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>
@@ -68,10 +64,6 @@
            <directory>../plugins/convention/target/apidocs</directory>
            <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>
@@ -96,10 +88,6 @@
            <directory>../plugins/jfreechart/target/apidocs</directory>
            <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>
@@ -148,10 +136,6 @@
            <directory>../plugins/spring/target/apidocs</directory>
            <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>
@@ -10,7 +10,7 @@
    </parent>

    <artifactId>struts2-bom</artifactId>
-    <version>2.3.25-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
    <packaging>pom</packaging>

    <name>Struts 2 Bill of Materials</name>
@@ -25,7 +25,7 @@
    </licenses>

    <properties>
-        <struts-version.version>2.3.25-SNAPSHOT</struts-version.version>
+        <struts-version.version>2.5-SNAPSHOT</struts-version.version>
    </properties>

    <build>
@@ -53,21 +53,11 @@
                <artifactId>struts2-core</artifactId>
                <version>${struts-version.version}</version>
            </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>
@@ -103,11 +93,6 @@
                <artifactId>struts2-javatemplates-plugin</artifactId>
                <version>${struts-version.version}</version>
            </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>
@@ -173,11 +158,6 @@
                <artifactId>struts2-spring-plugin</artifactId>
                <version>${struts-version.version}</version>
            </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>
@@ -410,11 +410,6 @@
                <artifactId>struts2-osgi-plugin</artifactId>
                <version>${project.version}</version>
            </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>
@@ -425,11 +420,6 @@
                <artifactId>struts2-config-browser-plugin</artifactId>
                <version>${project.version}</version>
            </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>
@@ -440,11 +430,6 @@
                <artifactId>struts2-jfreechart-plugin</artifactId>
                <version>${project.version}</version>
            </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>
@@ -470,11 +455,6 @@
                <artifactId>struts2-sitemesh-plugin</artifactId>
                <version>${project.version}</version>
            </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>