servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r614526 - in /servicemix/smx4/kernel/trunk: bundles/junit/pom.xml bundles/pom.xml pom.xml
Date Wed, 23 Jan 2008 13:04:49 GMT
Author: gnodet
Date: Wed Jan 23 05:04:46 2008
New Revision: 614526

URL: http://svn.apache.org/viewvc?rev=614526&view=rev
Log:
Suppress some warning, try to fix the release

Modified:
    servicemix/smx4/kernel/trunk/bundles/junit/pom.xml
    servicemix/smx4/kernel/trunk/bundles/pom.xml
    servicemix/smx4/kernel/trunk/pom.xml

Modified: servicemix/smx4/kernel/trunk/bundles/junit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/bundles/junit/pom.xml?rev=614526&r1=614525&r2=614526&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/bundles/junit/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/bundles/junit/pom.xml Wed Jan 23 05:04:46 2008
@@ -43,8 +43,8 @@
         <pkgArtifactId>junit</pkgArtifactId>
         <pkgVersion>${junit.version}</pkgVersion>
         <servicemix.osgi.export>
-            org.junit*;version=${pkgVersion},
-            junit*;version=${pkgVersion}
+            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,

Modified: servicemix/smx4/kernel/trunk/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/bundles/pom.xml?rev=614526&r1=614525&r2=614526&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/bundles/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/bundles/pom.xml Wed Jan 23 05:04:46 2008
@@ -44,7 +44,7 @@
     </modules>
 
     <properties>
-        <servicemix.osgi.export>${servicemix.osgi.export.pkg}*;version=${pkgVersion}</servicemix.osgi.export>
+        <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 />

Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=614526&r1=614525&r2=614526&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Wed Jan 23 05:04:46 2008
@@ -32,6 +32,7 @@
   <packaging>pom</packaging>
   <version>1.0-m1-SNAPSHOT</version>
   <name>Apache ServiceMix Kernel</name>
+  <inceptionYear>2007</inceptionYear>
 
   <modules>
     <module>bundles</module>
@@ -181,16 +182,24 @@
 
       <pluginManagement>
           <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-eclipse-plugin</artifactId>
-              <version>2.4</version>
-              <configuration>
-                <outputDirectory>${basedir}/eclipse-classes</outputDirectory>
-                <downloadSources>true</downloadSources>
-                <downloadJavadocs>true</downloadJavadocs>
-              </configuration>
-            </plugin>              
+              <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-eclipse-plugin</artifactId>
+                  <version>2.4</version>
+                  <configuration>
+                      <outputDirectory>${basedir}/eclipse-classes</outputDirectory>
+                      <downloadSources>true</downloadSources>
+                      <downloadJavadocs>true</downloadJavadocs>
+                  </configuration>
+              </plugin>
+              <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-release-plugin</artifactId>
+                  <version>2.0-beta-7</version>
+                  <configuration>
+                      <preparationGoals>clean,verify,install</preparationGoals>
+                  </configuration>
+              </plugin>
               <plugin>
                   <groupId>org.apache.felix</groupId>
                   <artifactId>maven-bundle-plugin</artifactId>



Mime
View raw message