You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/09/16 22:36:42 UTC

svn commit: r1523800 - in /cxf/trunk/distribution: manifest/pom.xml pom.xml src/main/assembly/bin.xml

Author: dkulp
Date: Mon Sep 16 20:36:42 2013
New Revision: 1523800

URL: http://svn.apache.org/r1523800
Log:
Remove the big bundle from the distro

Modified:
    cxf/trunk/distribution/manifest/pom.xml
    cxf/trunk/distribution/pom.xml
    cxf/trunk/distribution/src/main/assembly/bin.xml

Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=1523800&r1=1523799&r2=1523800&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Mon Sep 16 20:36:42 2013
@@ -318,11 +318,6 @@
             <artifactId>cxf-rt-javascript</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cxf-bundle</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <!-- services jars -->
         <dependency>

Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=1523800&r1=1523799&r2=1523800&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Mon Sep 16 20:36:42 2013
@@ -48,11 +48,6 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>cxf-bundle</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
             <artifactId>cxf-tools-common</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/assembly/bin.xml?rev=1523800&r1=1523799&r2=1523800&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ cxf/trunk/distribution/src/main/assembly/bin.xml Mon Sep 16 20:36:42 2013
@@ -95,13 +95,10 @@
         </fileSet>
         <fileSet>
             <directory>target/additional-libs</directory>
-            <outputDirectory>apache-cxf-${cxf.version}/modules/integration</outputDirectory>
+            <outputDirectory>apache-cxf-${cxf.version}/lib/integration</outputDirectory>
             <includes>
                 <include>**/*</include>
             </includes>
-            <excludes>
-                <exclude>cxf-bundle*.jar</exclude>
-            </excludes>
         </fileSet>
         <fileSet>
             <directory>target/libs/endorsed</directory>
@@ -118,13 +115,6 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>manifest/target</directory>
-            <outputDirectory>apache-cxf-${cxf.version}/modules</outputDirectory>
-            <includes>
-                <include>**/cxf-manifest.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
             <directory>target</directory>
             <outputDirectory>apache-cxf-${cxf.version}/etc</outputDirectory>
             <includes>
@@ -152,34 +142,8 @@
         <dependencySet>
             <outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
             <unpack>false</unpack>
-            <excludes>
-                <exclude>org.apache.cxf:*</exclude>
-            </excludes>
             <scope>runtime</scope>
         </dependencySet>
-        <dependencySet>
-            <outputDirectory>apache-cxf-${cxf.version}/modules</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.cxf:*</include>
-                <include>org.apache.cxf.xjcplugins:*</include>
-                <include>org.apache.cxf.services.*:*</include>
-            </includes>
-            <excludes>
-                <exclude>org.apache.cxf:cxf-bundle*</exclude>
-            </excludes>
-            <scope>runtime</scope>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.cxf:cxf-bundle</include>
-            </includes>
-            <scope>runtime</scope>
-            <outputFileNameMapping>cxf-${version}.jar</outputFileNameMapping>
-        </dependencySet>
-
     </dependencySets>
 
 </assembly>