Author: wsmoak
Date: Fri Sep 16 22:50:07 2005
New Revision: 289707
URL: http://svn.apache.org/viewcvs?rev=289707&view=rev
Log:
Updated Maven build files
- Pick up new .properties files for core-library tests
- Fix problem with empty source distributions when running from 'build'
- Check ibiblio.com first for dependencies
- Override jar:install goal for sub-projects with no .jar artifact
Modified:
struts/shale/trunk/build/README.txt
struts/shale/trunk/build/core-test/maven.xml
struts/shale/trunk/build/core-test/project.xml
struts/shale/trunk/build/maven.xml
struts/shale/trunk/build/project.properties
struts/shale/trunk/build/use-cases/maven.xml
Modified: struts/shale/trunk/build/README.txt
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/README.txt?rev=289707&r1=289706&r2=289707&view=diff
==============================================================================
--- struts/shale/trunk/build/README.txt (original)
+++ struts/shale/trunk/build/README.txt Fri Sep 16 22:50:07 2005
@@ -46,8 +46,6 @@
* The checkstyle report is disabled because it breaks the build of any
sub-project containing <sourceModifications>.
-* The source distributions do not include the source code
-
* The javadoc goal in the spring sub-project does not exclude the webflow
source files.
Modified: struts/shale/trunk/build/core-test/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/core-test/maven.xml?rev=289707&r1=289706&r2=289707&view=diff
==============================================================================
--- struts/shale/trunk/build/core-test/maven.xml (original)
+++ struts/shale/trunk/build/core-test/maven.xml Fri Sep 16 22:50:07 2005
@@ -1,15 +1,14 @@
-<project default="jar:jar"
+<project default="test:test"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven">
<goal name="dist">
- <attainGoal name="war"/>
+ <attainGoal name="test"/>
</goal>
- <goal name="jar:jar">
- <ant:echo>[INFO] There is no jar artifact for this sub-project.
- Use 'maven test' instead.</ant:echo>
+ <goal name="jar:install">
+ <!-- override -->
</goal>
</project>
Modified: struts/shale/trunk/build/core-test/project.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/core-test/project.xml?rev=289707&r1=289706&r2=289707&view=diff
==============================================================================
--- struts/shale/trunk/build/core-test/project.xml (original)
+++ struts/shale/trunk/build/core-test/project.xml Fri Sep 16 22:50:07 2005
@@ -47,6 +47,7 @@
<directory>${maven.src.dir}/test</directory>
<includes>
<include>**/*.xml</include>
+ <include>**/*.properties</include>
</includes>
</resource>
</resources>
Modified: struts/shale/trunk/build/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/maven.xml?rev=289707&r1=289706&r2=289707&view=diff
==============================================================================
--- struts/shale/trunk/build/maven.xml (original)
+++ struts/shale/trunk/build/maven.xml Fri Sep 16 22:50:07 2005
@@ -29,4 +29,15 @@
<attainGoal name="clean"/>
</postGoal>
+ <!-- Workaround for maven-dist-plugin's inability to find the
+ source code when running from 'build'. -->
+ <postGoal name="dist:prepare-src-filesystem">
+ <ant:available property="sourcePresent" file="${maven.src.dir}"/>
+ <j:if test="${sourcePresent}">
+ <ant:copy todir="${maven.dist.src.assembly.dir}/src">
+ <ant:fileset dir="${maven.src.dir}" />
+ </ant:copy>
+ </j:if>
+ </postGoal>
+
</project>
Modified: struts/shale/trunk/build/project.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/project.properties?rev=289707&r1=289706&r2=289707&view=diff
==============================================================================
--- struts/shale/trunk/build/project.properties (original)
+++ struts/shale/trunk/build/project.properties Fri Sep 16 22:50:07 2005
@@ -6,7 +6,7 @@
maven.repo.central.directory=/www/svn.apache.org/repository/ # nightly builds
maven.repo.central.directory=/www/www.apache.org/dist/java-repository
-maven.repo.remote=http://cvs.apache.org/repository/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://www.bluesunrise.com/maven/
+maven.repo.remote=http://www.ibiblio.org/maven/,http://cvs.apache.org/repository/,http://dist.codehaus.org/,http://www.bluesunrise.com/maven/
maven.multiproject.basedir = .
maven.multiproject.includes = */project.xml
Modified: struts/shale/trunk/build/use-cases/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build/use-cases/maven.xml?rev=289707&r1=289706&r2=289707&view=diff
==============================================================================
--- struts/shale/trunk/build/use-cases/maven.xml (original)
+++ struts/shale/trunk/build/use-cases/maven.xml Fri Sep 16 22:50:07 2005
@@ -36,11 +36,9 @@
tofile="${maven.war.webapp.dir}/WEB-INF/classes/org/apache/shale/usecases/view/Bundle_en.properties"/>
</preGoal>
-
- <goal name="jar:jar">
- <ant:echo>[INFO] There is no jar artifact for this sub-project.
- Use 'maven war' instead.</ant:echo>
+
+ <goal name="jar:install">
+ <!-- override -->
</goal>
-
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
