You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/05/19 06:31:00 UTC
svn commit: r946019 - in /geronimo/server/branches/3.0-M1: ./
framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
framework/buildsupport/geronimo-osgi-plugin/src/main/resources/
framework/configs/karaf-framework/
Author: gawor
Date: Wed May 19 04:30:59 2010
New Revision: 946019
URL: http://svn.apache.org/viewvc?rev=946019&view=rev
Log:
use 1.6.0 karaf artifacts under a vote
Modified:
geronimo/server/branches/3.0-M1/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
geronimo/server/branches/3.0-M1/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/pom.xml
geronimo/server/branches/3.0-M1/pom.xml
Modified: geronimo/server/branches/3.0-M1/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=946019&r1=946018&r2=946019&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/branches/3.0-M1/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Wed May 19 04:30:59 2010
@@ -845,7 +845,7 @@ public abstract class AbstractCarMojo
"org.apache.geronimo.system.util," +
"org.apache.geronimo.transformer," +
"org.apache.geronimo.mavenplugins.car," +
- "org.apache.felix.karaf.jaas.boot;version=\"1.5.0\"," +
+ "org.apache.felix.karaf.jaas.boot;version=\"1.6.0\"," +
"org.apache.yoko," +
"org.apache.yoko.osgi," +
"org.apache.yoko.rmispec.util"
Modified: geronimo/server/branches/3.0-M1/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile?rev=946019&r1=946018&r2=946019&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile (original)
+++ geronimo/server/branches/3.0-M1/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile Wed May 19 04:30:59 2010
@@ -142,7 +142,7 @@ org.osgi.framework.system.packages.extra
sun.misc,\
sun.reflect,\
org.apache.geronimo.transformer,\
- org.apache.felix.karaf.jaas.boot;version=1.5.0
+ org.apache.felix.karaf.jaas.boot;version=1.6.0
org.osgi.framework.bootdelegation = \
javax.*,\
Modified: geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/pom.xml?rev=946019&r1=946018&r2=946019&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/pom.xml Wed May 19 04:30:59 2010
@@ -31,8 +31,8 @@
<name>Geronimo Assemblies :: Karaf Boilerplate Framework</name>
<properties>
- <felix.karaf.version>1.5.0-SNAPSHOT</felix.karaf.version>
- <karaf.osgi.version>1.5.0</karaf.osgi.version>
+ <felix.karaf.version>1.6.0</felix.karaf.version>
+ <karaf.osgi.version>1.6.0</karaf.osgi.version>
<!-- from karaf root pom -->
<aopalliance.version>1.0_3</aopalliance.version>
Modified: geronimo/server/branches/3.0-M1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/pom.xml?rev=946019&r1=946018&r2=946019&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/pom.xml Wed May 19 04:30:59 2010
@@ -1852,7 +1852,7 @@ only found in cxf
<dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
<artifactId>org.apache.felix.karaf.shell.console</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0</version>
<exclusions>
<exclusion>
<groupId>jline</groupId>
@@ -1872,7 +1872,7 @@ only found in cxf
<dependency>
<groupId>org.apache.felix.karaf.jaas</groupId>
<artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
@@ -2349,6 +2349,19 @@ only found in cxf
</modules>
<repositories>
+ <repository>
+ <id>karaf</id>
+ <name>karaf</name>
+ <layout>default</layout>
+ <url>https://repository.apache.org/content/repositories/orgapachefelix-003</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
<repository>
<id>openejb</id>
<name>openejb</name>
@@ -2530,6 +2543,19 @@ only found in cxf
<repositories>
<repository>
+ <id>karaf</id>
+ <name>karaf</name>
+ <layout>default</layout>
+ <url>https://repository.apache.org/content/repositories/orgapachefelix-003</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <repository>
<!-- org.ops4j routing -->
<id>ops4j.snapshots</id>
<name>OPS4J Snapshots Repository</name>