You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2008/09/10 21:23:19 UTC
svn commit: r693937 - in
/activemq/camel/trunk/apache-camel/src/main/descriptors: common-bin.xml
unix-bin.xml windows-bin.xml
Author: janstey
Date: Wed Sep 10 12:23:18 2008
New Revision: 693937
URL: http://svn.apache.org/viewvc?rev=693937&view=rev
Log:
CAMEL-889 - Get around the maven assembly bug by using a wildcard.
Modified:
activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=693937&r1=693936&r2=693937&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Wed Sep 10 12:23:18 2008
@@ -19,6 +19,14 @@
<id>common-bin</id>
<fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>apache-camel-*.jar</include>
+ </includes>
+ </fileSet>
+
<!-- copy the manual docs -->
<fileSet>
<directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?rev=693937&r1=693936&r2=693937&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Wed Sep 10 12:23:18 2008
@@ -22,17 +22,6 @@
</formats>
<fileSets>
- <!-- Copy over the bundle jar.
- Needed to do this here because the maven-assembly-plugin
- did not recognize ${pom.version} in common-bin.xml -->
- <fileSet>
- <directory>target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>${pom.artifactId}-${pom.version}.jar</include>
- </includes>
- </fileSet>
-
<!-- Copy over everything that needs to get unix line endings -->
<fileSet>
<directory>src/main/release</directory>
Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?rev=693937&r1=693936&r2=693937&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Wed Sep 10 12:23:18 2008
@@ -22,17 +22,6 @@
</formats>
<fileSets>
- <!-- Copy over the bundle jar.
- Needed to do this here because the maven-assembly-plugin
- did not recognize ${pom.version} in common-bin.xml -->
- <fileSet>
- <directory>target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>${pom.artifactId}-${pom.version}.jar</include>
- </includes>
- </fileSet>
-
<!-- Copy over everything that needs to get dos line endings -->
<fileSet>
<directory>src/main/release</directory>