geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r926236 - in /geronimo/server/trunk/framework: buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java configs/karaf-framework/pom.xml pom.xml
Date Mon, 22 Mar 2010 18:18:15 GMT
Author: gawor
Date: Mon Mar 22 18:18:15 2010
New Revision: 926236

URL: http://svn.apache.org/viewvc?rev=926236&view=rev
Log:
switch back to latest Felix framework as its resolver seems to be working much better now

Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/pom.xml

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=926236&r1=926235&r2=926236&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
Mon Mar 22 18:18:15 2010
@@ -812,7 +812,6 @@ public abstract class AbstractCarMojo
                         "org.apache.commons.jexl;version=\"1.1\"," +
                         "org.apache.commons.jexl.context;version=\"1.1\"," +
                         "org.apache.commons.jexl.resolver;version=\"1.1\"," +
-                        "org.apache.commons.logging;version=\"1.1.1\"," +
                         "org.apache.geronimo.cli," +
                         "org.apache.geronimo.cli.client," +
                         "org.apache.geronimo.cli.daemon," +
@@ -947,7 +946,11 @@ public abstract class AbstractCarMojo
         
         File storageDir = new File(basedir, "target/bundle-cache");
         properties.put(Constants.FRAMEWORK_STORAGE, storageDir.getAbsolutePath());
-        
+
+        if (log.isDebugEnabled()) {
+            properties.put("felix.log.level", "4");
+        }
+
         /* 
          * A hack for Equinox to restore FrameworkProperties to the initial state.
          * If the FrameworkProperties is not restored to the initial state, Equinox

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=926236&r1=926235&r2=926236&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Mon Mar 22 18:18:15 2010
@@ -44,7 +44,7 @@
         <felix.compendium.version>1.2.0</felix.compendium.version>
         <felix.configadmin.version>1.2.4</felix.configadmin.version>
         <felix.fileinstall.version>2.0.8</felix.fileinstall.version>
-        <felix.framework.version>2.0.4</felix.framework.version>
+        <felix.framework.version>2.1.0-SNAPSHOT</felix.framework.version>
         <felix.gogo.version>0.2.2</felix.gogo.version>
         <felix.osgi.version>1.4.0</felix.osgi.version>
         <felix.plugin.version>2.0.1</felix.plugin.version>

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=926236&r1=926235&r2=926236&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Mon Mar 22 18:18:15 2010
@@ -44,7 +44,7 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.framework</artifactId>
-                <version>2.0.4</version>
+                <version>2.1.0-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.osgi</groupId>



Mime
View raw message