You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/02/06 18:04:59 UTC
svn commit: r504227 - in /incubator/yoko/trunk:
distribution/assembly-bin.xml distribution/assembly-src.xml
distribution/pom.xml pom.xml
Author: bravi
Date: Tue Feb 6 10:04:58 2007
New Revision: 504227
URL: http://svn.apache.org/viewvc?view=rev&rev=504227
Log:
[YOKO-285] - Fixed the distribution module to use single goal for assembly & also change the directory names to 1.0-incubating-M2
Modified:
incubator/yoko/trunk/distribution/assembly-bin.xml
incubator/yoko/trunk/distribution/assembly-src.xml
incubator/yoko/trunk/distribution/pom.xml
incubator/yoko/trunk/pom.xml
Modified: incubator/yoko/trunk/distribution/assembly-bin.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/assembly-bin.xml?view=diff&rev=504227&r1=504226&r2=504227
==============================================================================
--- incubator/yoko/trunk/distribution/assembly-bin.xml (original)
+++ incubator/yoko/trunk/distribution/assembly-bin.xml Tue Feb 6 10:04:58 2007
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
<directory>..</directory>
- <outputDirectory>yoko-incubating-bin-1.0-M1</outputDirectory>
+ <outputDirectory>yoko-incubating-bin-1.0-M2</outputDirectory>
<includes>
<include>README*</include>
<include>LICENSE*</include>
@@ -37,12 +37,12 @@
</fileSet>
<fileSet>
<directory>src/main/bin</directory>
- <outputDirectory>yoko-incubating-bin-1.0-M1/bin</outputDirectory>
+ <outputDirectory>yoko-incubating-bin-1.0-M2/bin</outputDirectory>
<fileMode>775</fileMode>
</fileSet>
<fileSet>
<directory>src/main/samples</directory>
- <outputDirectory>yoko-incubating-bin-1.0-M1/samples</outputDirectory>
+ <outputDirectory>yoko-incubating-bin-1.0-M2/samples</outputDirectory>
<excludes>
<exclude>**/build</exclude>
<exclude>**/build/**/*</exclude>
@@ -50,18 +50,18 @@
</fileSet>
<fileSet>
<directory>../etc/third_party_licenses</directory>
- <outputDirectory>yoko-incubating-bin-1.0-M1/etc/third_party_licenses</outputDirectory>
+ <outputDirectory>yoko-incubating-bin-1.0-M2/etc/third_party_licenses</outputDirectory>
</fileSet>
<fileSet>
<directory>target</directory>
- <outputDirectory>yoko-incubating-bin-1.0-M1/lib</outputDirectory>
+ <outputDirectory>yoko-incubating-bin-1.0-M2/lib</outputDirectory>
<includes>
<include>yoko-${project.version}.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>target/javadoc</directory>
- <outputDirectory>yoko-incubating-bin-1.0-M1/docs/api</outputDirectory>
+ <outputDirectory>yoko-incubating-bin-1.0-M2/docs/api</outputDirectory>
<includes>
<include>**/*</include>
</includes>
@@ -69,7 +69,7 @@
</fileSets>
<dependencySets>
<dependencySet>
- <outputDirectory>yoko-incubating-bin-1.0-M1/lib</outputDirectory>
+ <outputDirectory>yoko-incubating-bin-1.0-M2/lib</outputDirectory>
<outputFileNameMapping>${artifactId}-${baseVersion}.${extension}</outputFileNameMapping>
<unpack>false</unpack>
<scope>runtime</scope>
Modified: incubator/yoko/trunk/distribution/assembly-src.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/assembly-src.xml?view=diff&rev=504227&r1=504226&r2=504227
==============================================================================
--- incubator/yoko/trunk/distribution/assembly-src.xml (original)
+++ incubator/yoko/trunk/distribution/assembly-src.xml Tue Feb 6 10:04:58 2007
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
<directory>..</directory>
- <outputDirectory>yoko-incubating-src-1.0-M1</outputDirectory>
+ <outputDirectory>yoko-incubating-src-1.0-M2</outputDirectory>
<includes>
<include>**/*</include>
</includes>
Modified: incubator/yoko/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/pom.xml?view=diff&rev=504227&r1=504226&r2=504227
==============================================================================
--- incubator/yoko/trunk/distribution/pom.xml (original)
+++ incubator/yoko/trunk/distribution/pom.xml Tue Feb 6 10:04:58 2007
@@ -69,7 +69,7 @@
<id>distribution-src-epl</id>
<phase>package</phase>
<goals>
- <goal>assembly</goal>
+ <goal>single</goal>
</goals>
<configuration>
<archive>
Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/pom.xml?view=diff&rev=504227&r1=504226&r2=504227
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Tue Feb 6 10:04:58 2007
@@ -476,7 +476,7 @@
<repositories>
<repository>
- <id>apache.snapshots</id>
+ <id>apache-snapshot-repository</id>
<name>Apache repo</name>
<url>http://people.apache.org/maven-snapshot-repository</url>
<releases>
@@ -487,7 +487,7 @@
</snapshots>
</repository>
<repository>
- <id>apache.incubating</id>
+ <id>apache-incubating-repository</id>
<name>Apache incubating repo</name>
<url>http://people.apache.org/repo/m2-incubating-repository</url>
</repository>
@@ -501,7 +501,7 @@
<pluginRepositories>
<pluginRepository>
- <id>apache.incubating</id>
+ <id>apache-incubating-repository</id>
<name>Apache incubating repo</name>
<url>http://people.apache.org/repo/m2-incubating-repository</url>
<layout>default</layout>
@@ -531,7 +531,7 @@
</releases>
</pluginRepository>
<pluginRepository>
- <id>apache.snapshots</id>
+ <id>apache-snapshot-repository</id>
<name>Maven apache plugins snapshot repository</name>
<url>http://people.apache.org/maven-snapshot-repository</url>
<layout>default</layout>