Author: henning
Date: Tue Aug 30 01:41:43 2005
New Revision: 264740
URL: http://svn.apache.org/viewcvs?rev=264740&view=rev
Log:
Add dist building code to maven.xml and POM
Modified:
jakarta/turbine/stratum/trunk/maven.xml
jakarta/turbine/stratum/trunk/project.xml
Modified: jakarta/turbine/stratum/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/maven.xml?rev=264740&r1=264739&r2=264740&view=diff
==============================================================================
--- jakarta/turbine/stratum/trunk/maven.xml (original)
+++ jakarta/turbine/stratum/trunk/maven.xml Tue Aug 30 01:41:43 2005
@@ -25,4 +25,39 @@
<!-- ========================================================================
-->
<project
- default="jar:jar"/>
+ xmlns:j="jelly:core"
+ default="jar:jar">
+
+ <!-- ================================================================== -->
+ <!-- D I S T : B U I L D _ B I N P R E G O A L -->
+ <!-- ================================================================== -->
+ <!-- copies jars, sample configuration ... to the -->
+ <!-- ${maven.dist.bin.assembly.dir} to include them in the binary dists -->
+ <!-- ================================================================== -->
+ <preGoal name="dist:build-bin">
+ <!-- include listed dependencies -->
+ <j:forEach var="dep" items="${pom.dependencies}">
+ <j:if test="${dep.getProperty('dist.bundle') != null &&
dep.getProperty('dist.bundle').equalsIgnoreCase('true')}">
+ <copy todir="${maven.dist.bin.assembly.dir}/lib"
+
file="${maven.repo.local}/${dep.getArtifactDirectory()}/jars/${dep.getArtifact()}"/>
+ </j:if>
+ </j:forEach>
+ </preGoal>
+
+ <!-- ================================================================== -->
+ <!-- D I S T : B U I L D _ S R C P R E G O A L -->
+ <!-- ================================================================== -->
+ <!-- includes common files -->
+ <!-- This is necessary as long as maven does not resolves the extends -->
+ <!-- property of the pom upon generation of the source distribution -->
+ <!-- ================================================================== -->
+ <preGoal name="dist:build-src">
+ <copy todir="${maven.dist.src.assembly.dir}/conf">
+ <fileset dir="${basedir}/conf">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ </preGoal>
+
+
+</project>
Modified: jakarta/turbine/stratum/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/project.xml?rev=264740&r1=264739&r2=264740&view=diff
==============================================================================
--- jakarta/turbine/stratum/trunk/project.xml (original)
+++ jakarta/turbine/stratum/trunk/project.xml Tue Aug 30 01:41:43 2005
@@ -125,6 +125,9 @@
<version>0.7</version>
<url>http://jakarta.apache.org/commons/betwixt/</url>
<type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -132,6 +135,9 @@
<version>1.6.1</version>
<url>http://jakarta.apache.org/commons/beanutils/</url>
<type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -139,6 +145,9 @@
<version>3.0</version>
<url>http://jakarta.apache.org/commons/collections/</url>
<type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
@@ -146,6 +155,9 @@
<version>1.0</version>
<url>http://jakarta.apache.org/commons/configuration/</url>
<type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
@@ -153,6 +165,9 @@
<version>1.5</version>
<url>http://jakarta.apache.org/commons/digester/</url>
<type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -160,6 +175,9 @@
<version>2.0</version>
<url>http://jakarta.apache.org/commons/lang/</url>
<type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -167,12 +185,18 @@
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>commons-messenger</groupId>
<artifactId>commons-messenger</artifactId>
<version>1.0-dev-14</version>
<type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>jms</groupId>
@@ -180,18 +204,18 @@
<version>1.1</version>
<url>http://java.sun.com/products/jms/</url>
<type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.8</version>
+ <version>1.2.11</version>
<url>http://logging.apache.org/log4j/</url>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects</artifactId>
- <version>0.1</version>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
<type>jar</type>
</dependency>
<dependency>
@@ -199,23 +223,37 @@
<artifactId>ojb</artifactId>
<version>0.5.200</version>
<type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
<version>1.4.5</version>
<type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
</dependency>
<!-- needed for testing, if maven.junit.fork = true -->
<dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects</artifactId>
+ <version>0.1</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<url>http://www.junit.org/</url>
<type>jar</type>
</dependency>
+
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
@@ -223,6 +261,7 @@
<url>http://xml.apache.org/xerces2-j/</url>
<type>jar</type>
</dependency>
+
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
@@ -230,6 +269,8 @@
<url>http://xml.apache.org/commons/</url>
<type>jar</type>
</dependency>
+
+<!-- maven plugins -->
<dependency>
<groupId>maven</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]