Author: rmannibucau
Date: Sun Aug 19 19:50:47 2012
New Revision: 1374829
URL: http://svn.apache.org/viewvc?rev=1374829&view=rev
Log:
OPENEJB-1894 karaf 2.2.9
Modified:
openejb/trunk/openejb/osgi/apache-karafee/pom.xml
openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties
openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml
openejb/trunk/openejb/osgi/pom.xml
Modified: openejb/trunk/openejb/osgi/apache-karafee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/apache-karafee/pom.xml?rev=1374829&r1=1374828&r2=1374829&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/apache-karafee/pom.xml (original)
+++ openejb/trunk/openejb/osgi/apache-karafee/pom.xml Sun Aug 19 19:50:47 2012
@@ -31,8 +31,8 @@
<packaging>pom</packaging>
<repositories>
- <repository> <!-- eclipse osgi is not available in repo1 since some days
-->
- <id>opensource</id>
+ <repository>
+ <id>opensource</id> <!-- eclipse osgi -->
<url>http://ebayopensource.org/nexus/content/groups/public/</url>
</repository>
</repositories>
Modified:
openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties?rev=1374829&r1=1374828&r2=1374829&view=diff
==============================================================================
---
openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties
(original)
+++
openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties
Sun Aug 19 19:50:47 2012
@@ -41,7 +41,7 @@ karaf.framework=felix
# Location of the OSGi frameworks
#
karaf.framework.equinox=${karaf.default.repository}/org/eclipse/osgi/3.6.2.R36x_v20110210/osgi-3.6.2.R36x_v20110210.jar
-karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/3.0.9/org.apache.felix.framework-3.0.9.jar
+karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/3.2.2/org.apache.felix.framework-3.2.2.jar
#
# Framework config properties.
@@ -63,7 +63,7 @@ org.osgi.framework.system.packages.extra
org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,!com.sun.xml.internal.bind.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*
# OSGi Execution Environment
-org.osgi.framework.executionenvironment=J2SE-1.7,J2SE-1.6,J2SE-1.5,J2SE-1.4,J2SE-1.3,J2SE-1.2
+org.osgi.framework.executionenvironment=J2SE-1.7,JavaSE-1.7,J2SE-1.6,JavaSE-1.6,J2SE-1.5,JavaSE-1.5,J2SE-1.4,JavaSE-1.4,J2SE-1.3,JavaSE-1.3,J2SE-1.2,,JavaSE-1.2,CDC-1.1/Foundation-1.1,CDC-1.0/Foundation-1.0,J2ME,OSGi/Minimum-1.1,OSGi/Minimum-1.0
# Set the parent classloader for the bundle to the classloader that loads the
Framework (i.e. everything in lib/*.jar)
org.osgi.framework.bundle.parent=framework
Modified: openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml?rev=1374829&r1=1374828&r2=1374829&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml Sun Aug 19 19:50:47
2012
@@ -32,19 +32,13 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>2.3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency> <!-- to avoid a snapshot dep -->
- <groupId>org.ops4j.base</groupId>
- <artifactId>ops4j-base-monitors</artifactId>
- <version>1.2.3</version>
+ <version>2.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openengsb.labs.paxexam.karaf</groupId>
<artifactId>paxexam-karaf-container</artifactId>
- <version>0.5.2</version>
+ <version>1.0.0</version>
<scope>test</scope>
</dependency>
<!--
Modified: openejb/trunk/openejb/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/pom.xml?rev=1374829&r1=1374828&r2=1374829&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/pom.xml (original)
+++ openejb/trunk/openejb/osgi/pom.xml Sun Aug 19 19:50:47 2012
@@ -40,7 +40,7 @@
</modules>
<properties>
- <karaf.version>2.2.8</karaf.version>
+ <karaf.version>2.2.9</karaf.version>
<karafee.version>1.1.0-SNAPSHOT</karafee.version>
</properties>
</project>
