You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/06/23 14:21:12 UTC

svn commit: r670537 - in /servicemix/smx4/kernel/trunk: main/pom.xml pom.xml

Author: gnodet
Date: Mon Jun 23 05:21:12 2008
New Revision: 670537

URL: http://svn.apache.org/viewvc?rev=670537&view=rev
Log:
Unpack bundle so that the build works, use felix osgi 1.0.1, specifiy the shade plugin version

Modified:
    servicemix/smx4/kernel/trunk/main/pom.xml
    servicemix/smx4/kernel/trunk/pom.xml

Modified: servicemix/smx4/kernel/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/pom.xml?rev=670537&r1=670536&r2=670537&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/main/pom.xml Mon Jun 23 05:21:12 2008
@@ -84,6 +84,7 @@
                         <Import-Package>!*</Import-Package>
                         <Include-Resource>src/main/resources/</Include-Resource>
                     </instructions>
+                    <unpackBundle>true</unpackBundle>
                 </configuration>
             </plugin>
             <plugin>

Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=670537&r1=670536&r2=670537&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Mon Jun 23 05:21:12 2008
@@ -70,7 +70,7 @@
       <felix.main.version>1.0.4</felix.main.version>
       <felix.plugin.version>1.4.0</felix.plugin.version>
       <felix.framework.version>1.0.4</felix.framework.version>
-      <felix.osgi.version>1.0.0</felix.osgi.version>
+      <felix.osgi.version>1.0.1</felix.osgi.version>
       <felix.compendium.version>1.0.0</felix.compendium.version>
       <felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
       <felix.prefs.version>1.0.2</felix.prefs.version>
@@ -261,6 +261,11 @@
                   <artifactId>maven-surefire-plugin</artifactId>
                   <version>2.3.1</version>
               </plugin>
+              <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-shade-plugin</artifactId>
+                  <version>1.1</version>
+              </plugin>
           </plugins>
       </pluginManagement>
       <plugins>