Update to jbosgi-resolver-2.0.0.Beta4

jbosgi · Mar 12, 2012 · 7d762bb · 7d762bb
1 parent 06f3003
commit 7d762bb
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 30 deletions.
diff --git a/distribution/docbook/pom.xml b/distribution/docbook/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.jboss.osgi.distribution</groupId>
         <artifactId>jboss-osgi-distribution</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <name>JBossOSGi Distribution Userguide</name>

diff --git a/distribution/installer/pom.xml b/distribution/installer/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.jboss.osgi.distribution</groupId>
         <artifactId>jboss-osgi-distribution</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <!-- Dependencies -->

diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.jboss.osgi.distribution</groupId>
         <artifactId>jboss-osgi-distribution</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <!-- Properties -->

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -36,7 +36,7 @@
     <parent>
         <groupId>org.jboss.osgi</groupId>
         <artifactId>jboss-osgi</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <!-- Modules -->

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <artifactId>jboss-osgi</artifactId>
     <packaging>pom</packaging>
 
-    <version>1.1.1</version>
+    <version>1.2.0-SNAPSHOT</version>
 
     <!-- Source Control -->
     <scm>
@@ -61,13 +61,13 @@
         <version.jboss.osgi.deployment>1.0.12.Final</version.jboss.osgi.deployment>
         <version.jboss.osgi.equinox>3.5.2.SP1</version.jboss.osgi.equinox>
         <version.jboss.osgi.felix>3.0.4</version.jboss.osgi.felix>
-        <version.jboss.osgi.framework>1.1.8.Final</version.jboss.osgi.framework>
-        <version.jboss.osgi.http>1.0.5</version.jboss.osgi.http>
+        <version.jboss.osgi.framework>1.2.0-SNAPSHOT</version.jboss.osgi.framework>
+        <version.jboss.osgi.javax.servlet>2.5.Final</version.jboss.osgi.javax.servlet>
         <version.jboss.osgi.jmx>1.0.11</version.jboss.osgi.jmx>
         <version.jboss.osgi.logging>1.0.0</version.jboss.osgi.logging>
         <version.jboss.osgi.metadata>2.0.3.Final</version.jboss.osgi.metadata>
-        <version.jboss.osgi.repository>1.0.5</version.jboss.osgi.repository>
-        <version.jboss.osgi.resolver>1.0.13.Final</version.jboss.osgi.resolver>
+        <version.jboss.osgi.repository>1.0.6</version.jboss.osgi.repository>
+        <version.jboss.osgi.resolver>2.0.0.Beta4</version.jboss.osgi.resolver>
         <version.jboss.osgi.spi>3.0.1.Final</version.jboss.osgi.spi>
         <version.jboss.osgi.testing>1.0.2</version.jboss.osgi.testing>
         <version.jboss.osgi.vfs>1.0.7.Final</version.jboss.osgi.vfs>
@@ -101,6 +101,12 @@
             <dependency>
                 <groupId>org.jboss.arquillian.container</groupId>
                 <artifactId>arquillian-container-osgi-embedded</artifactId>
+                <exclusions>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
                 <version>${version.jboss.arquillian.osgi}</version>
             </dependency>
             <dependency>
@@ -165,9 +171,9 @@
                 <version>${version.jboss.osgi.framework}</version>
             </dependency>
             <dependency>
-                <groupId>org.jboss.osgi.http</groupId>
-                <artifactId>jbosgi-http-api</artifactId>
-                <version>${version.jboss.osgi.http}</version>
+                <groupId>org.jboss.osgi</groupId>
+                <artifactId>javax.servlet.api</artifactId>
+                <version>${version.jboss.osgi.javax.servlet}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.osgi.jmx</groupId>
@@ -189,6 +195,11 @@
                 <artifactId>jbosgi-repository</artifactId>
                 <version>${version.jboss.osgi.repository}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jboss.osgi.resolver</groupId>
+                <artifactId>jbosgi-resolver-felix-v2</artifactId>
+                <version>${version.jboss.osgi.resolver}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.osgi.testing</groupId>
                 <artifactId>jbosgi-testing</artifactId>

diff --git a/reactor/pom.xml b/reactor/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.jboss.osgi</groupId>
         <artifactId>jboss-osgi</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <name>JBossOSGi Reactor</name>

diff --git a/testsuite/example/pom.xml b/testsuite/example/pom.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
+<!--                                                                        -->
+<!-- JBoss, the OpenSource J2EE webOS                                       -->
+<!--                                                                        -->
+<!-- Distributable under LGPL license.                                      -->
+<!-- See terms of license at http://www.gnu.org.                            -->
+<!--                                                                        -->
 <!-- ====================================================================== -->
 
 <!-- 
 
   Set these VM properties in your IDE debugger 
 
+  -Djava.util.logging.manager=org.jboss.logmanager.LogManager
   -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-example/target}/test-libs 
 -->
 
@@ -23,12 +24,11 @@
     <parent>
         <groupId>org.jboss.osgi.testsuite</groupId>
         <artifactId>jboss-osgi-testsuite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <name>JBossOSGi Testsuite Examples</name>
 
-    <groupId>org.jboss.osgi.testsuite</groupId>
     <artifactId>jboss-osgi-testsuite-example</artifactId>
     <packaging>jar</packaging>
 
@@ -81,8 +81,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.jboss.osgi.http</groupId>
-            <artifactId>jbosgi-http-api</artifactId>
+            <groupId>org.jboss.osgi</groupId>
+            <artifactId>javax.servlet.api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/testsuite/example/scripts/assembly-bundles.xml b/testsuite/example/scripts/assembly-bundles.xml
@@ -19,9 +19,9 @@
             <includes>
                 <include>*:org.apache.felix.log:jar</include>
                 <include>*:org.osgi.enterprise:jar</include>
+                <include>*:javax.servlet.api:jar</include>
                 <include>*:jbosgi-repository-api:jar</include>
                 <include>*:jbosgi-repository:jar</include>
-                <include>*:jbosgi-http-api:jar</include>
                 <include>*:jboss-osgi-logging:jar</include>
             </includes>
             <useStrictFiltering>true</useStrictFiltering>

diff --git a/testsuite/example/src/test/resources/jboss-osgi-framework.properties b/testsuite/example/src/test/resources/jboss-osgi-framework.properties
@@ -17,7 +17,7 @@ org.osgi.framework.system.packages.extra=\
 # Bundles that need to be installed with the Framework automatically 
 org.jboss.osgi.auto.install=\
 	file://${test.archive.directory}/bundles/org.osgi.enterprise.jar,\
-	file://${test.archive.directory}/bundles/jbosgi-http-api.jar,\
+	file://${test.archive.directory}/bundles/javax.servlet.api.jar,\
 	file://${test.archive.directory}/bundles/jbosgi-repository-api.jar
 
 # Bundles that need to be started automatically 

diff --git a/testsuite/example/src/test/resources/logging.properties b/testsuite/example/src/test/resources/logging.properties
@@ -21,8 +21,10 @@
 #
 
 # Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.shrinkwrap
+loggers=org.jboss.shrinkwrap,org.jboss.modules,org.jboss.osgi.resolver
 logger.org.jboss.shrinkwrap.level=INFO
+#logger.org.jboss.osgi.resolver.level=TRACE
+#logger.org.jboss.modules.level=TRACE
 
 # Root logger level
 logger.level=DEBUG
@@ -33,7 +35,7 @@ logger.handlers=FILE
 # Console handler configuration
 handler.FILE=org.jboss.logmanager.handlers.FileHandler
 handler.FILE.properties=autoFlush,fileName
-handler.FILE.level=DEBUG
+handler.FILE.level=TRACE
 handler.FILE.autoFlush=true
 handler.FILE.fileName=./target/test.log
 handler.FILE.formatter=PATTERN

diff --git a/testsuite/functional/pom.xml b/testsuite/functional/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.jboss.osgi.testsuite</groupId>
         <artifactId>jboss-osgi-testsuite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <!-- Dependencies -->

diff --git a/testsuite/performance/pom.xml b/testsuite/performance/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.jboss.osgi.testsuite</groupId>
         <artifactId>jboss-osgi-testsuite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <name>JBossOSGi Testsuite Performance</name>

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.jboss.osgi</groupId>
         <artifactId>jboss-osgi</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <name>JBossOSGi Testsuite</name>