Repository: struts Updated Branches: refs/heads/master 11561cb29 -> 0835c33ad
Cleans up after migrating to Tiles 3 and dropped struts2-tiles3-plugin Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0835c33a Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0835c33a Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0835c33a Branch: refs/heads/master Commit: 0835c33adf634a1ecbff748a320c050cada90d82 Parents: 11561cb Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu Jan 21 09:20:05 2016 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu Jan 21 09:20:05 2016 +0100 ---------------------------------------------------------------------- .gitignore | 1 - assembly/pom.xml | 5 ----- assembly/src/main/assembly/all.xml | 4 ---- assembly/src/main/assembly/docs.xml | 4 ---- bom/pom.xml | 5 ----- pom.xml | 5 ----- 6 files changed, 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/0835c33a/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index bcebcd9..0285aab 100644 --- a/.gitignore +++ b/.gitignore @@ -54,7 +54,6 @@ plugins/portlet-tiles/target plugins/portlet/target plugins/sitegraph/target plugins/sitemesh/target -plugins/tiles3/target plugins/javatemplates/target bundles/demo/target plugins/rest/target http://git-wip-us.apache.org/repos/asf/struts/blob/0835c33a/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 94c1013..a5e3a04 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -221,11 +221,6 @@ <dependency> <groupId>org.apache.struts</groupId> - <artifactId>struts2-tiles3-plugin</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> <artifactId>struts2-oval-plugin</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/struts/blob/0835c33a/assembly/src/main/assembly/all.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml index c3027ac..ef9e682 100644 --- a/assembly/src/main/assembly/all.xml +++ b/assembly/src/main/assembly/all.xml @@ -227,10 +227,6 @@ <directory>../plugins/tiles/target/apidocs</directory> <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin/apidocs</outputDirectory> </fileSet> - <fileSet> - <directory>../plugins/tiles3/target/apidocs</directory> - <outputDirectory>docs/struts2-plugins/struts2-tiles3-plugin/apidocs</outputDirectory> - </fileSet> <!-- bundles --> <fileSet> http://git-wip-us.apache.org/repos/asf/struts/blob/0835c33a/assembly/src/main/assembly/docs.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml index f486c7e..e27107c 100644 --- a/assembly/src/main/assembly/docs.xml +++ b/assembly/src/main/assembly/docs.xml @@ -150,10 +150,6 @@ <directory>../plugins/tiles/target/apidocs</directory> <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin/apidocs</outputDirectory> </fileSet> - <fileSet> - <directory>../plugins/tiles3/target/apidocs</directory> - <outputDirectory>docs/struts2-plugins/struts2-tiles3-plugin/apidocs</outputDirectory> - </fileSet> </fileSets> </assembly> http://git-wip-us.apache.org/repos/asf/struts/blob/0835c33a/bom/pom.xml ---------------------------------------------------------------------- diff --git a/bom/pom.xml b/bom/pom.xml index 12b3f75..e170a5e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -173,11 +173,6 @@ <artifactId>struts2-tiles-plugin</artifactId> <version>${struts-version.version}</version> </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-tiles3-plugin</artifactId> - <version>${struts-version.version}</version> - </dependency> </dependencies> </dependencyManagement> </project> http://git-wip-us.apache.org/repos/asf/struts/blob/0835c33a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 08c94b4..1dc97da 100644 --- a/pom.xml +++ b/pom.xml @@ -458,11 +458,6 @@ </dependency> <dependency> <groupId>org.apache.struts</groupId> - <artifactId>struts2-tiles3-plugin</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.struts</groupId> <artifactId>struts2-osgi-admin-bundle</artifactId> <version>${project.version}</version> </dependency>
