Author: wsmoak
Date: Fri Nov 18 17:50:05 2005
New Revision: 345622
URL: http://svn.apache.org/viewcvs?rev=345622&view=rev
Log:
Improvements to the Maven build files:
- Remove duplicate/unnecessary dependencies
- Use standard Sun jar names
- Move to MyFaces 1.1.1
- Remove references to Spring Webflow (code was deleted in r345620)
Removed:
struts/shale/trunk/build/spring/webflow/
Modified:
struts/shale/trunk/build/core-library/project.xml
struts/shale/trunk/build/mailreader/project.xml
struts/shale/trunk/build/myfaces-project.xml
struts/shale/trunk/build/project.xml
struts/shale/trunk/build/spring/project.xml
struts/shale/trunk/build/tiles/project.xml
struts/shale/trunk/build/use-cases/project.xml
Modified: struts/shale/trunk/build/core-library/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/core-library/project.xml?rev=345622&r1=345621&r2=345622&view=diff
==============================================================================
--- struts/shale/trunk/build/core-library/project.xml (original)
+++ struts/shale/trunk/build/core-library/project.xml Fri Nov 18 17:50:05 2005
@@ -92,33 +92,6 @@
<dependencies>
<dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.2.0</version>
- <url>jakarta.apache.org/commons/validator/</url>
- </dependency>
-
- <dependency>
- <groupId>tiles</groupId>
- <artifactId>tiles-core</artifactId>
- <version>SNAPSHOT</version>
-
<url>http://cvs.apache.org/builds/struts/nightly/sandbox/tiles-core/</url>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- <url>jakarta.apache.org/commons/validator/</url>
- </dependency>
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
-
- <dependency>
<groupId>portlet-api</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
Modified: struts/shale/trunk/build/mailreader/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/mailreader/project.xml?rev=345622&r1=345621&r2=345622&view=diff
==============================================================================
--- struts/shale/trunk/build/mailreader/project.xml (original)
+++ struts/shale/trunk/build/mailreader/project.xml Fri Nov 18 17:50:05 2005
@@ -93,7 +93,7 @@
</dependency>
<dependency>
- <groupId>jstl</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.1.2</version>
<properties>
Modified: struts/shale/trunk/build/myfaces-project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/myfaces-project.xml?rev=345622&r1=345621&r2=345622&view=diff
==============================================================================
--- struts/shale/trunk/build/myfaces-project.xml (original)
+++ struts/shale/trunk/build/myfaces-project.xml Fri Nov 18 17:50:05 2005
@@ -32,7 +32,7 @@
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
<url>http://myfaces.apache.org/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -42,7 +42,7 @@
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
<url>http://myfaces.apache.org/</url>
<properties>
<war.bundle>true</war.bundle>
Modified: struts/shale/trunk/build/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/project.xml?rev=345622&r1=345621&r2=345622&view=diff
==============================================================================
--- struts/shale/trunk/build/project.xml (original)
+++ struts/shale/trunk/build/project.xml Fri Nov 18 17:50:05 2005
@@ -148,14 +148,14 @@
<dependencies>
<dependency>
- <groupId>servletapi</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<url>http://java.sun.com/products/servlet/</url>
</dependency>
<dependency>
- <groupId>jspapi</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<url>http://java.sun.com/products/jsp/</url>
Modified: struts/shale/trunk/build/spring/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/spring/project.xml?rev=345622&r1=345621&r2=345622&view=diff
==============================================================================
--- struts/shale/trunk/build/spring/project.xml (original)
+++ struts/shale/trunk/build/spring/project.xml Fri Nov 18 17:50:05 2005
@@ -44,7 +44,6 @@
<exclude>org/apache/shale/remote/**</exclude>
<exclude>org/apache/shale/renderer/**</exclude>
<exclude>org/apache/shale/resources/**</exclude>
- <exclude>org/apache/shale/spring/webflow/**</exclude>
<exclude>org/apache/shale/taglib/**</exclude>
<exclude>org/apache/shale/tiles/**</exclude>
<exclude>org/apache/shale/util/**</exclude>
@@ -81,32 +80,6 @@
</build>
<dependencies>
-
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.2.0</version>
- <url>jakarta.apache.org/commons/validator/</url>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- <url>jakarta.apache.org/commons/validator/</url>
- </dependency>
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- </dependency>
<dependency>
<groupId>springframework</groupId>
Modified: struts/shale/trunk/build/tiles/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/tiles/project.xml?rev=345622&r1=345621&r2=345622&view=diff
==============================================================================
--- struts/shale/trunk/build/tiles/project.xml (original)
+++ struts/shale/trunk/build/tiles/project.xml Fri Nov 18 17:50:05 2005
@@ -89,36 +89,10 @@
<dependencies>
<dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.2.0</version>
- <url>jakarta.apache.org/commons/validator/</url>
- </dependency>
-
- <dependency>
<groupId>tiles</groupId>
<artifactId>tiles-core</artifactId>
<version>SNAPSHOT</version>
<url>http://cvs.apache.org/builds/struts/nightly/sandbox/tiles-core/</url>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- <url>jakarta.apache.org/commons/validator/</url>
- </dependency>
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
</dependency>
</dependencies>
Modified: struts/shale/trunk/build/use-cases/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/use-cases/project.xml?rev=345622&r1=345621&r2=345622&view=diff
==============================================================================
--- struts/shale/trunk/build/use-cases/project.xml (original)
+++ struts/shale/trunk/build/use-cases/project.xml Fri Nov 18 17:50:05 2005
@@ -109,7 +109,7 @@
</dependency>
<dependency>
- <groupId>jstl</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.1.2</version>
<properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
