Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 15:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trying putting struts2 in the artifact id rather than the group id. This

Browse Source 
works better when having maven generate IDE projects so that they don't
conflict with Struts 1 artifacts.  Also fixed up a few other poms.

WW-1367


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@418532 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2006-07-02 00:16:06 +00:00
parent b318348c4f
commit 989fae9e17
12 changed files with 49 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/pom.xml
+4 -4
View File
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts.action2</groupId>
<artifactId>struts-action2-parent</artifactId>
<groupId>org.apache.struts2</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
<artifactId>struts-api</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-api</artifactId>
<packaging>jar</packaging>
<name>Struts 2 API</name>
<dependencies>
apps/blank/pom.xml
+4 -4
View File
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-apps</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-blank</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-blank</artifactId>
<packaging>war</packaging>
<name>Blank Webapp</name>
<dependencies>
apps/pom.xml
+5 -5
View File
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts2</groupId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-apps</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
<name>Webapps</name>
<modules>
@@ -121,8 +121,8 @@
<dependencies>
<dependency>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-core</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>${pom.version}</version>
</dependency>
apps/portlet/pom.xml
+4 -4
View File
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-apps</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-portlet</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-portlet</artifactId>
<packaging>war</packaging>
<name>Portlet Webapp</name>
<dependencies>
apps/shopping-cart/pom.xml
+4 -4
View File
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-apps</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-shopping-cart</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-shopping-cart</artifactId>
<packaging>war</packaging>
<name>Shopping Cart Webapp</name>
<dependencies>
apps/showcase/pom.xml
+4 -4
View File
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-apps</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-showcase</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-showcase</artifactId>
<packaging>war</packaging>
<name>Showcase Webapp</name>
<profiles>
apps/starter/pom.xml
+4 -4
View File
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-apps</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-starter</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-starter</artifactId>
<packaging>war</packaging>
<name>Starter Webapp</name>
<dependencies>
archetype/pom.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.struts.action2</groupId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetype-quickstart</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
core/pom.xml
+3 -3
View File
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts2</groupId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-core</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
<name>Struts 2 - Core</name>
extras/pom.xml
+5 -5
View File
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts2</groupId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-extras</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-extras</artifactId>
<packaging>jar</packaging>
<name>Struts Extras</name>
@@ -29,8 +29,8 @@
</dependency>
<dependency>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-core</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>${pom.version}</version>
</dependency>
pom.xml
+1 -1
View File
@@ -30,7 +30,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.struts2</groupId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
uber/pom.xml
+10 -20
View File
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts2</groupId>
<artifactId>struts-action2-parent</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts2</groupId>
<artifactId>action-all</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-all</artifactId>
<packaging>pom</packaging>
<name>Uber Jar</name>
<build>
@@ -34,28 +34,18 @@
</build>
<dependencies>
<dependency>
<groupId>org.apache.struts2</groupId>
<artifactId>action-api</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.struts2</groupId>
<artifactId>action</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.struts2</groupId>
<artifactId>action-jasperreports</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.struts2</groupId>
<artifactId>action-jfreechart</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.struts2</groupId>
<artifactId>action-pell-file-upload</artifactId>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-extras</artifactId>
<scope>test</scope>
</dependency>
</dependencies>