Author: wsmoak
Date: Thu Sep 22 22:18:30 2005
New Revision: 291076
URL: http://svn.apache.org/viewcvs?rev=291076&view=rev
Log:
Updates to the Maven build files
- Move to MyFaces 1.1.0 and add additional dependencies for the usecases app
- Add JDK 1.4 as compile target and Javadoc source level
- Exclude rather than include packages for spring and tiles (Javadoc plugin
was not working with includes)
Modified:
struts/shale/trunk/build/README.txt
struts/shale/trunk/build/myfaces-project.xml
struts/shale/trunk/build/project.properties
struts/shale/trunk/build/spring/project.xml
struts/shale/trunk/build/spring/webflow/project.xml
struts/shale/trunk/build/tiles/project.xml
Modified: struts/shale/trunk/build/README.txt
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/README.txt?rev=291076&r1=291075&r2=291076&view=diff
==============================================================================
--- struts/shale/trunk/build/README.txt (original)
+++ struts/shale/trunk/build/README.txt Thu Sep 22 22:18:30 2005
@@ -30,7 +30,7 @@
To build the multiproject website:
- $ maven multiproject:site -Dmaven.multiproject.excludes=spring/*,tiles/*
+ $ maven multiproject:site
Choosing a JSF Implementation
-----------------------------
@@ -52,9 +52,6 @@
* The checkstyle report is disabled because it breaks the build of any
sub-project containing <sourceModifications>.
-
-* The javadoc goal in the spring sub-project does not exclude the webflow
-source files.
Spring Webflow
Modified: struts/shale/trunk/build/myfaces-project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/myfaces-project.xml?rev=291076&r1=291075&r2=291076&view=diff
==============================================================================
--- struts/shale/trunk/build/myfaces-project.xml (original)
+++ struts/shale/trunk/build/myfaces-project.xml Thu Sep 22 22:18:30 2005
@@ -32,7 +32,7 @@
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.1.0</version>
<url>http://myfaces.apache.org/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -42,8 +42,38 @@
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.1.0</version>
<url>http://myfaces.apache.org/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.2</version>
+ <url>http://jakarta.apache.org/commons/codec/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/el/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/fileupload/</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
Modified: struts/shale/trunk/build/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/project.properties?rev=291076&r1=291075&r2=291076&view=diff
==============================================================================
--- struts/shale/trunk/build/project.properties (original)
+++ struts/shale/trunk/build/project.properties Thu Sep 22 22:18:30 2005
@@ -17,3 +17,7 @@
maven.shale.jsf.impl.default=myfaces
maven.compile.source=1.4
+maven.compile.target=1.4
+
+maven.javadoc.source=1.4
+
Modified: struts/shale/trunk/build/spring/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/spring/project.xml?rev=291076&r1=291075&r2=291076&view=diff
==============================================================================
--- struts/shale/trunk/build/spring/project.xml (original)
+++ struts/shale/trunk/build/spring/project.xml Thu Sep 22 22:18:30 2005
@@ -40,9 +40,21 @@
<sourceModifications>
<sourceModification>
<className>x.y.z.Class</className>
- <includes>
- <include>org/apache/shale/spring/*</include>
- </includes>
+ <excludes>
+ <exclude>org/apache/shale/application/**</exclude>
+ <exclude>org/apache/shale/component/**</exclude>
+ <exclude>org/apache/shale/dialog/**</exclude>
+ <exclude>org/apache/shale/faces/**</exclude>
+ <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>
+ <exclude>org/apache/shale/validator/**</exclude>
+ <exclude>org/apache/shale/view/**</exclude>
+ </excludes>
</sourceModification>
</sourceModifications>
Modified: struts/shale/trunk/build/spring/webflow/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/spring/webflow/project.xml?rev=291076&r1=291075&r2=291076&view=diff
==============================================================================
--- struts/shale/trunk/build/spring/webflow/project.xml (original)
+++ struts/shale/trunk/build/spring/webflow/project.xml Thu Sep 22 22:18:30 2005
@@ -40,9 +40,21 @@
<sourceModifications>
<sourceModification>
<className>x.y.z.Class</className>
- <includes>
- <include>org/apache/shale/spring/webflow/*</include>
- </includes>
+ <excludes>
+ <exclude>org/apache/shale/application/**</exclude>
+ <exclude>org/apache/shale/component/**</exclude>
+ <exclude>org/apache/shale/dialog/**</exclude>
+ <exclude>org/apache/shale/faces/**</exclude>
+ <exclude>org/apache/shale/remote/**</exclude>
+ <exclude>org/apache/shale/renderer/**</exclude>
+ <exclude>org/apache/shale/resources/**</exclude>
+ <exclude>org/apache/shale/spring/*</exclude>
+ <exclude>org/apache/shale/taglib/**</exclude>
+ <exclude>org/apache/shale/tiles/**</exclude>
+ <exclude>org/apache/shale/util/**</exclude>
+ <exclude>org/apache/shale/validator/**</exclude>
+ <exclude>org/apache/shale/view/**</exclude>
+ </excludes>
</sourceModification>
</sourceModifications>
Modified: struts/shale/trunk/build/tiles/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/tiles/project.xml?rev=291076&r1=291075&r2=291076&view=diff
==============================================================================
--- struts/shale/trunk/build/tiles/project.xml (original)
+++ struts/shale/trunk/build/tiles/project.xml Thu Sep 22 22:18:30 2005
@@ -40,9 +40,20 @@
<sourceModifications>
<sourceModification>
<className>x.y.z.Class</className>
- <includes>
- <include>org/apache/shale/tiles/**</include>
- </includes>
+ <excludes>
+ <exclude>org/apache/shale/application/**</exclude>
+ <exclude>org/apache/shale/component/**</exclude>
+ <exclude>org/apache/shale/dialog/**</exclude>
+ <exclude>org/apache/shale/faces/**</exclude>
+ <exclude>org/apache/shale/remote/**</exclude>
+ <exclude>org/apache/shale/renderer/**</exclude>
+ <exclude>org/apache/shale/resources/**</exclude>
+ <exclude>org/apache/shale/spring/**</exclude>
+ <exclude>org/apache/shale/taglib/**</exclude>
+ <exclude>org/apache/shale/util/**</exclude>
+ <exclude>org/apache/shale/validator/**</exclude>
+ <exclude>org/apache/shale/view/**</exclude>
+ </excludes>
</sourceModification>
</sourceModifications>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
