servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r670755 - in /servicemix/smx4/bundles: ./ branches/ tags/ trunk/ trunk/ant-1.7.0/ trunk/aopalliance-1.0/ trunk/asm-2.2.3/ trunk/bundles-pom/ trunk/cglib-2.1_3/ trunk/commons-io-1.3.2/ trunk/commons-jxpath-1.2/ trunk/howl-1.0.1-1/ trunk/jasp...
Date Mon, 23 Jun 2008 21:12:21 GMT
Author: gnodet
Date: Mon Jun 23 14:12:19 2008
New Revision: 670755

URL: http://svn.apache.org/viewvc?rev=670755&view=rev
Log:
Create bundles tree

Added:
    servicemix/smx4/bundles/
    servicemix/smx4/bundles/branches/
    servicemix/smx4/bundles/tags/
    servicemix/smx4/bundles/trunk/
    servicemix/smx4/bundles/trunk/LICENSE.txt
      - copied unchanged from r670476, servicemix/smx4/kernel/trunk/LICENSE.txt
    servicemix/smx4/bundles/trunk/NOTICE.txt
      - copied unchanged from r670476, servicemix/smx4/kernel/trunk/NOTICE.txt
    servicemix/smx4/bundles/trunk/ant-1.7.0/
      - copied from r670476, servicemix/smx4/kernel/trunk/bundles/ant/
    servicemix/smx4/bundles/trunk/aopalliance-1.0/
      - copied from r670476, servicemix/smx4/kernel/trunk/bundles/aopalliance/
    servicemix/smx4/bundles/trunk/asm-2.2.3/
      - copied from r670476, servicemix/smx4/kernel/trunk/bundles/asm/
    servicemix/smx4/bundles/trunk/bundles-pom/
    servicemix/smx4/bundles/trunk/bundles-pom/pom.xml
    servicemix/smx4/bundles/trunk/cglib-2.1_3/
      - copied from r670476, servicemix/smx4/kernel/trunk/bundles/cglib/
    servicemix/smx4/bundles/trunk/commons-io-1.3.2/
      - copied from r670633, servicemix/smx4/features/trunk/camel/bundles/commons-io/
    servicemix/smx4/bundles/trunk/commons-jxpath-1.2/
      - copied from r670633, servicemix/smx4/features/trunk/camel/bundles/commons-jxpath/
    servicemix/smx4/bundles/trunk/howl-1.0.1-1/
      - copied from r670633, servicemix/smx4/features/trunk/transaction/bundles/howl/
    servicemix/smx4/bundles/trunk/jasper-6.0.14/
      - copied from r670633, servicemix/smx4/features/trunk/war/bundles/jasper/
    servicemix/smx4/bundles/trunk/jaxb-impl-2.1.6/
      - copied from r670633, servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/
    servicemix/smx4/bundles/trunk/jencks-2.1/
      - copied from r670633, servicemix/smx4/features/trunk/transaction/bundles/jencks/
    servicemix/smx4/bundles/trunk/junit-4.4/
      - copied from r670476, servicemix/smx4/kernel/trunk/bundles/junit/
    servicemix/smx4/bundles/trunk/mina-1.1.6/
      - copied from r670476, servicemix/smx4/kernel/trunk/bundles/mina/
    servicemix/smx4/bundles/trunk/neethi-2.0.2/
      - copied from r670633, servicemix/smx4/features/trunk/cxf/bundles/neethi/
    servicemix/smx4/bundles/trunk/saaj-impl-1.3/
      - copied from r670633, servicemix/smx4/features/trunk/cxf/bundles/saaj-impl/
    servicemix/smx4/bundles/trunk/woodstox-3.2.6/
      - copied from r670476, servicemix/smx4/nmr/trunk/bundles/woodstox/
    servicemix/smx4/bundles/trunk/wsdl4j-1.6.1/
      - copied from r670633, servicemix/smx4/features/trunk/cxf/bundles/wsdl4j/
    servicemix/smx4/bundles/trunk/xmlresolver-1.2/
      - copied from r670633, servicemix/smx4/features/trunk/cxf/bundles/xmlresolver/
    servicemix/smx4/bundles/trunk/xmlschema-1.4.2/
      - copied from r670633, servicemix/smx4/features/trunk/cxf/bundles/xmlschema/
Modified:
    servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml
    servicemix/smx4/bundles/trunk/aopalliance-1.0/pom.xml
    servicemix/smx4/bundles/trunk/asm-2.2.3/pom.xml
    servicemix/smx4/bundles/trunk/cglib-2.1_3/pom.xml
    servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml
    servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml
    servicemix/smx4/bundles/trunk/howl-1.0.1-1/pom.xml
    servicemix/smx4/bundles/trunk/jasper-6.0.14/pom.xml
    servicemix/smx4/bundles/trunk/jaxb-impl-2.1.6/pom.xml
    servicemix/smx4/bundles/trunk/jencks-2.1/pom.xml
    servicemix/smx4/bundles/trunk/junit-4.4/pom.xml
    servicemix/smx4/bundles/trunk/mina-1.1.6/pom.xml
    servicemix/smx4/bundles/trunk/neethi-2.0.2/pom.xml
    servicemix/smx4/bundles/trunk/saaj-impl-1.3/pom.xml
    servicemix/smx4/bundles/trunk/woodstox-3.2.6/pom.xml
    servicemix/smx4/bundles/trunk/wsdl4j-1.6.1/pom.xml
    servicemix/smx4/bundles/trunk/xmlresolver-1.2/pom.xml
    servicemix/smx4/bundles/trunk/xmlschema-1.4.2/pom.xml

Modified: servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml?rev=670755&r1=670476&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,26 +21,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.kernel.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <!--
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    -->
-    <artifactId>org.apache.servicemix.bundles.ant-1.7.0</artifactId>
+    <artifactId>org.apache.servicemix.bundles.ant</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <version>1.7.0_1-SNAPSHOT</version>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>org.apache.ant</pkgGroupId>
         <pkgArtifactId>ant</pkgArtifactId>
-        <pkgVersion>${ant.version}</pkgVersion>
+        <pkgVersion>1.7.0</pkgVersion>
         <servicemix.osgi.export.pkg>org.apache.tools</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             com.sun.tools.javac*;resolution:=optional,
@@ -53,16 +51,9 @@
         </servicemix.osgi.import.pkg>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>apache-incubator</id>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
-            <groupId>org.apache.ant</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>ant</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
@@ -73,12 +64,47 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:ant</include>
+                                    <include>${pkgGroupId}:ant-launcher</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:ant</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:ant-launcher</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/aopalliance-1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/aopalliance-1.0/pom.xml?rev=670755&r1=670476&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/aopalliance-1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/aopalliance-1.0/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,42 +21,67 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.kernel.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <!--
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    -->
-    <artifactId>org.apache.servicemix.bundles.aopalliance-1.0</artifactId>
+    <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <version>1.0_1-SNAPSHOT</version>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>aopalliance</pkgGroupId>
         <pkgArtifactId>aopalliance</pkgArtifactId>
-        <pkgVersion>${aopalliance.version}</pkgVersion>
+        <pkgVersion>1.0</pkgVersion>
         <servicemix.osgi.export.pkg>org.aopalliance</servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>aopalliance</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/asm-2.2.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/asm-2.2.3/pom.xml?rev=670755&r1=670476&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/asm-2.2.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/asm-2.2.3/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,42 +21,68 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.kernel.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <!--
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    -->
-    <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
+    <artifactId>org.apache.servicemix.bundles.asm</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <version>2.2.3_1-SNAPSHOT</version>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>asm</pkgGroupId>
         <pkgArtifactId>asm</pkgArtifactId>
-        <pkgVersion>${asm.version}</pkgVersion>
+        <pkgVersion>2.2.3</pkgVersion>
         <servicemix.osgi.export.pkg>org.objectweb.asm</servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>asm</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>asm-all</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:asm-all</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:asm-all</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Added: servicemix/smx4/bundles/trunk/bundles-pom/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/bundles-pom/pom.xml?rev=670755&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/bundles-pom/pom.xml (added)
+++ servicemix/smx4/bundles/trunk/bundles-pom/pom.xml Mon Jun 23 14:12:19 2008
@@ -0,0 +1,69 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <!--
+
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements.  See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to You under the Apache License, Version 2.0
+        (the "License"); you may not use this file except in compliance with
+        the License.  You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+	    <groupId>org.apache.servicemix</groupId>
+	    <artifactId>servicemix-pom</artifactId>
+	    <version>1.0</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>bundles-pom</artifactId>
+    <packaging>pom</packaging>
+    <version>1-SNAPSHOT</version>
+    <name>Apache ServiceMix Bundles</name>
+
+    <properties>
+        <servicemix.osgi.export>${servicemix.osgi.export.pkg}*;version=${pkgVersion};-split-package:=merge-first</servicemix.osgi.export>
+        <servicemix.osgi.export.pkg />
+        <servicemix.osgi.import.pkg />
+        <servicemix.osgi.private.pkg />
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>bundle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>${servicemix.osgi.export}</Export-Package>
+                        <Import-Package>${servicemix.osgi.import.pkg}*</Import-Package>
+                        <Private-Package>${servicemix.osgi.private.pkg}</Private-Package>
+                    </instructions>
+                    <unpackBundle>true</unpackBundle>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/cglib-2.1_3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/cglib-2.1_3/pom.xml?rev=670755&r1=670476&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/cglib-2.1_3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/cglib-2.1_3/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,26 +21,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.kernel.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <!--
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    -->
-    <artifactId>org.apache.servicemix.bundles.cglib-2.1_3</artifactId>
+    <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <version>2.1_3_1-SNAPSHOT</version>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>cglib</pkgGroupId>
         <pkgArtifactId>cglib</pkgArtifactId>
-        <pkgVersion>${cglib.version}</pkgVersion>
+        <pkgVersion>2.1_3</pkgVersion>
         <servicemix.osgi.export.pkg>net.sf.cglib</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             net.sf.cglib.asm.util;resolution:=optional,
@@ -52,17 +50,45 @@
 
     <dependencies>
         <dependency>
-            <groupId>cglib</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>cglib-nodep</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:cglib-nodep</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:cglib-nodep</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml?rev=670755&r1=670633&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,23 +21,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.camel.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>4.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    <version>4.0-m2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
+    <version>1.3.2_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>commons-io</pkgGroupId>
         <pkgArtifactId>commons-io</pkgArtifactId>
-        <pkgVersion>${commons-io.version}</pkgVersion>
+        <pkgVersion>1.3.2</pkgVersion>
         <servicemix.osgi.export.pkg>
             org.apache.commons.io*
         </servicemix.osgi.export.pkg>
@@ -45,15 +46,44 @@
 
     <dependencies>
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml?rev=670755&r1=670633&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,23 +21,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.camel.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>4.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    <version>4.0-m2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.commons-jxpath</artifactId>
+    <version>1.2_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>commons-jxpath</pkgGroupId>
         <pkgArtifactId>commons-jxpath</pkgArtifactId>
-        <pkgVersion>${commons-jxpath.version}</pkgVersion>
+        <pkgVersion>1.2</pkgVersion>
         <servicemix.osgi.export.pkg>
             org.apache.commons.jxpath*,org.apache.commons.beanutils*,org.apache.commons.collections*,org.jdom*,org.apache.xerces*,
             javax.servlet.jsp*,org.apache.xml*
@@ -50,15 +51,44 @@
 
     <dependencies>
         <dependency>
-            <groupId>commons-jxpath</groupId>
-            <artifactId>commons-jxpath</artifactId>
-            <version>${commons-jxpath.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/howl-1.0.1-1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/howl-1.0.1-1/pom.xml?rev=670755&r1=670633&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/howl-1.0.1-1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/howl-1.0.1-1/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,21 +21,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.transaction.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>4.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.howl-1.0.1-1</artifactId>
-    <version>4.0-m2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.howl</artifactId>
+    <version>1.0.1-1_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>org.objectweb.howl</pkgGroupId>
         <pkgArtifactId>howl</pkgArtifactId>
         <pkgVersion>1.0.1-1</pkgVersion>
         <servicemix.osgi.export.pkg>org.objectweb.howl</servicemix.osgi.export.pkg>
@@ -46,10 +47,45 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.objectweb.howl</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/jasper-6.0.14/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jasper-6.0.14/pom.xml?rev=670755&r1=670633&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jasper-6.0.14/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jasper-6.0.14/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,23 +21,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.war.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>4.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    <version>4.0-m2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.jasper</artifactId>
+    <version>6.0.14_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>org.apache.tomcat</pkgGroupId>
         <pkgArtifactId>jasper</pkgArtifactId>
-        <pkgVersion>${jasper.version}</pkgVersion>
+        <pkgVersion>6.0.14</pkgVersion>
         <servicemix.osgi.export.pkg>org.apache,org.apache.jasper*</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             javax*;resolution:=optional,
@@ -51,16 +52,45 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/jaxb-impl-2.1.6/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-impl-2.1.6/pom.xml?rev=670755&r1=670633&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-impl-2.1.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-impl-2.1.6/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,23 +21,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.camel.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>4.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    <version>4.0-m2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+    <version>2.1.6_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>com.sun.xml.bind</pkgGroupId>
         <pkgArtifactId>jaxb-impl</pkgArtifactId>
-        <pkgVersion>${jaxb.impl.version}</pkgVersion>
+        <pkgVersion>2.1.6</pkgVersion>
         <servicemix.osgi.export.pkg>
             com.sun.xml.bind*,
             com.sun.istack*,
@@ -59,28 +60,54 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-            <version>${servicemix.specs.version}</version>
-            <optional>true</optional>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
-            <version>${servicemix.specs.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
+            <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jencks-2.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jencks-2.1/pom.xml?rev=670755&r1=670633&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jencks-2.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jencks-2.1/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,21 +21,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.transaction.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>4.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.jencks-2.1</artifactId>
-    <version>4.0-m2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.jencks</artifactId>
+    <version>2.1_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>org.jencks</pkgGroupId>
         <pkgArtifactId>jencks</pkgArtifactId>
         <pkgVersion>2.1</pkgVersion>
         <servicemix.osgi.export.pkg>org.jencks</servicemix.osgi.export.pkg>
@@ -50,16 +51,49 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jencks</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-            <version>${geronimo.j2ee.connector.version}</version>
-            <optional>true</optional>
+            <version>2.0.0</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/junit-4.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/junit-4.4/pom.xml?rev=670755&r1=670476&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/junit-4.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/junit-4.4/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,43 +21,77 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.kernel.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <!--
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    -->
-    <artifactId>org.apache.servicemix.bundles.junit-4.4</artifactId>
+    <artifactId>org.apache.servicemix.bundles.junit</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <version>4.4_1-SNAPSHOT</version>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>junit</pkgGroupId>
         <pkgArtifactId>junit</pkgArtifactId>
-        <pkgVersion>${junit.version}</pkgVersion>
+        <pkgVersion>4.4</pkgVersion>
         <servicemix.osgi.export>
             org.junit*;version=${pkgVersion};-split-package:=merge-first,
             junit*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            org.hamcrest*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
+        <servicemix.osgi.private.pkg>
+            org.hamcrest*
+        </servicemix.osgi.private.pkg>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/mina-1.1.6/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/mina-1.1.6/pom.xml?rev=670755&r1=670476&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/mina-1.1.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/mina-1.1.6/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,26 +21,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.kernel.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <!--
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    -->
-    <artifactId>org.apache.servicemix.bundles.mina-1.1.6</artifactId>
+    <artifactId>org.apache.servicemix.bundles.mina</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <version>1.1.6_1-SNAPSHOT</version>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>org.apache.mina</pkgGroupId>
         <pkgArtifactId>mina</pkgArtifactId>
-        <pkgVersion>${mina.version}</pkgVersion>
+        <pkgVersion>1.1.6</pkgVersion>
         <servicemix.osgi.export.pkg>
             org.apache.mina
 	    </servicemix.osgi.export.pkg>
@@ -53,47 +51,104 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.mina</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>mina-core</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.apache.mina</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>mina-filter-codec-netty</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.apache.mina</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>mina-filter-compression</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.apache.mina</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>mina-filter-ssl</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.apache.mina</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>mina-integration-jmx</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.apache.mina</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>mina-integration-spring</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:mina-core</include>
+                                    <include>${pkgGroupId}:mina-filter-codec-netty</include>
+                                    <include>${pkgGroupId}:mina-filter-compression</include>
+                                    <include>${pkgGroupId}:mina-filter-ssl</include>
+                                    <include>${pkgGroupId}:mina-integration-jmx</include>
+                                    <include>${pkgGroupId}:mina-integration-spring</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:mina-core</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:mina-filter-codec-netty</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:mina-filter-compression</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:mina-filter-ssl</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:mina-integration-jmx</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:mina-integration-spring</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/neethi-2.0.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/neethi-2.0.2/pom.xml?rev=670755&r1=670633&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/neethi-2.0.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/neethi-2.0.2/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,21 +21,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.cxf.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>4.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
-    <version>4.0-m2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
+    <version>2.0.2_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>org.apache.neethi</pkgGroupId>
         <pkgArtifactId>neethi</pkgArtifactId>
         <pkgVersion>2.0.2</pkgVersion>
         <servicemix.osgi.import.pkg>
@@ -51,8 +52,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.neethi</groupId>
-            <artifactId>neethi</artifactId>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
             <exclusions>
@@ -84,4 +85,38 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/saaj-impl-1.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saaj-impl-1.3/pom.xml?rev=670755&r1=670633&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/saaj-impl-1.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/saaj-impl-1.3/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,21 +21,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.cxf.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>4.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.saaj-impl-1.3</artifactId>
-    <version>4.0-m2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.saaj-impl</artifactId>
+    <version>1.3_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>com.sun.xml.messaging.saaj</pkgGroupId>
         <pkgArtifactId>saaj-impl</pkgArtifactId>
         <pkgVersion>1.3</pkgVersion>
         <servicemix.osgi.export.pkg>com.sun.xml.messaging.saaj</servicemix.osgi.export.pkg>
@@ -50,7 +51,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.sun.xml.messaging.saaj</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
@@ -62,10 +63,44 @@
             </exclusions>
         </dependency>
         <dependency>
-		    <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-saaj_1.3_spec</artifactId>
-            <version>${geronimo.saaj.version}</version>
-            <optional>true</optional>
+		    <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/woodstox-3.2.6/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/woodstox-3.2.6/pom.xml?rev=670755&r1=670476&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/woodstox-3.2.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/woodstox-3.2.6/pom.xml Mon Jun 23 14:12:19 2008
@@ -22,23 +22,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.nmr.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
+    <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0-m2-SNAPSHOT</version>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <version>3.2.6_1-SNAPSHOT</version>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>org.codehaus.woodstox</pkgGroupId>
         <pkgArtifactId>woodstox</pkgArtifactId>
-        <pkgVersion>${woodstox.version}</pkgVersion>
+        <pkgVersion>3.2.6</pkgVersion>
         <servicemix.osgi.import.pkg>
             com.sun.msv*;resolution:=optional,
             org.relaxng*;resolution:=optional,
@@ -55,7 +56,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
+            <groupId>${pkgGroupId}</groupId>
             <artifactId>wstx-asl</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
@@ -69,9 +70,43 @@
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-            <version>${servicemix.specs.version}</version>
+            <version>1.0.0</version>
             <optional>true</optional>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:wstx-asl</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:wstx-asl</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/wsdl4j-1.6.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/wsdl4j-1.6.1/pom.xml?rev=670755&r1=670633&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/wsdl4j-1.6.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/wsdl4j-1.6.1/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,21 +21,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.cxf.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>4.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
-    <version>4.0-m2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+    <version>1.6.1_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
     <properties>
+        <pkgGroupId>wsdl4j</pkgGroupId>
         <pkgArtifactId>wsdl4j</pkgArtifactId>
         <pkgVersion>1.6.1</pkgVersion>
         <servicemix.osgi.export>
@@ -46,11 +47,45 @@
 
     <dependencies>
         <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/xmlresolver-1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xmlresolver-1.2/pom.xml?rev=670755&r1=670633&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xmlresolver-1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xmlresolver-1.2/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,16 +21,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.cxf.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>4.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
-    <version>4.0-m2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+    <version>1.2_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
@@ -51,4 +51,38 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>xml-resolver:xml-resolver</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>xml-resolver:xml-resolver</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/xmlschema-1.4.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xmlschema-1.4.2/pom.xml?rev=670755&r1=670633&r2=670755&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xmlschema-1.4.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xmlschema-1.4.2/pom.xml Mon Jun 23 14:12:19 2008
@@ -21,16 +21,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.cxf.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>4.0-m2-SNAPSHOT</version>
+	    <groupId>org.apache.servicemix.bundles</groupId>
+	    <artifactId>bundles-pom</artifactId>
+	    <version>1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.xmlschema-1.4.2</artifactId>
-    <version>4.0-m2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId>
+    <version>1.4.2_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}</name>
+    <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
@@ -51,4 +51,38 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.apache.ws.commons.schema:XmlSchema</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>org.apache.ws.commons.schema:XmlSchema</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file



Mime
View raw message