You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/05/23 16:47:27 UTC
svn commit: r1341878 - in /geronimo/yoko/trunk: pom.xml yoko-core/pom.xml yoko-osgi/pom.xml

Author: xiaming
Date: Wed May 23 14:47:27 2012
New Revision: 1341878

URL: http://svn.apache.org/viewvc?rev=1341878&view=rev
Log:
Use osgi 4.3.0 and revert maven bundle plugin to 2.0.1 since 2.3.4 generated bundle has package uses conflict issue

Modified:
    geronimo/yoko/trunk/pom.xml
    geronimo/yoko/trunk/yoko-core/pom.xml
    geronimo/yoko/trunk/yoko-osgi/pom.xml

Modified: geronimo/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/pom.xml?rev=1341878&r1=1341877&r2=1341878&view=diff
==============================================================================
--- geronimo/yoko/trunk/pom.xml (original)
+++ geronimo/yoko/trunk/pom.xml Wed May 23 14:47:27 2012
@@ -241,7 +241,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.3.4</version>
+                    <version>2.0.1</version>
                     <extensions>true</extensions>
                     <configuration>
                         <instructions>
@@ -281,4 +281,4 @@
         <url>http://svn.apache.org/viewvc/geronimo/yoko/trunk</url>
     </scm>
 
-</project>
\ No newline at end of file
+</project>

Modified: geronimo/yoko/trunk/yoko-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-core/pom.xml?rev=1341878&r1=1341877&r2=1341878&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-core/pom.xml (original)
+++ geronimo/yoko/trunk/yoko-core/pom.xml Wed May 23 14:47:27 2012
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/yoko/trunk/yoko-osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-osgi/pom.xml?rev=1341878&r1=1341877&r2=1341878&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-osgi/pom.xml (original)
+++ geronimo/yoko/trunk/yoko-osgi/pom.xml Wed May 23 14:47:27 2012
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>