Author: dkulp
Date: Wed Mar 5 17:50:57 2008
New Revision: 634117
URL: http://svn.apache.org/viewvc?rev=634117&view=rev
Log:
Fix to get working with latest assembly plugin
Modified:
incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
incubator/cxf/trunk/pom.xml
Modified: incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/bin.xml?rev=634117&r1=634116&r2=634117&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Wed Mar 5
17:50:57 2008
@@ -99,14 +99,14 @@
<directory>manifest/target</directory>
<outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
<includes>
- <include>cxf-manifest-incubator.jar</include>
+ <include>**/cxf-manifest-incubator.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>manifest/target</directory>
<outputDirectory>apache-cxf-${cxf.version}/modules</outputDirectory>
<includes>
- <include>cxf-manifest-incubator.jar</include>
+ <include>**/cxf-manifest-incubator.jar</include>
</includes>
</fileSet>
<fileSet>
@@ -167,7 +167,7 @@
<include>org.apache.cxf:cxf-bundle</include>
</includes>
<scope>runtime</scope>
-
<outputFileNameMapping>cxf-${version}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>cxf-${version}.jar</outputFileNameMapping>
</dependencySet>
</dependencySets>
Modified: incubator/cxf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?rev=634117&r1=634116&r2=634117&view=diff
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Wed Mar 5 17:50:57 2008
@@ -437,7 +437,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
+ <version>2.2-beta-2</version>
</plugin>
<plugin>
