Merge remote-tracking branch 'Activiti/fix-osgi-v5' into 5.22.0-release

Conflicts: modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
Activiti · Nov 2, 2016 · fa0c82d · fa0c82d
2 parents e92ce37 + 3036a10
commit fa0c82d
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 30 deletions.
diff --git a/modules/activiti-osgi/pom.xml b/modules/activiti-osgi/pom.xml
@@ -80,40 +80,40 @@
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit4</artifactId>
-      <version>3.3.0</version>
+      <version>4.9.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-link-mvn</artifactId>
-      <version>3.3.0</version>
+      <version>4.9.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.url</groupId>
       <artifactId>pax-url-aether</artifactId>
-      <version>1.6.0</version>
+      <version>2.4.7</version>
       <type>bundle</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>3.2.2</version>
+      <version>5.4.0</version>
       <type>bundle</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.tinybundles</groupId>
       <artifactId>tinybundles</artifactId>
-      <version>2.0.0</version>
+      <version>2.1.1</version>
       <type>bundle</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-container-native</artifactId>
-      <version>3.3.0</version>
+      <version>4.9.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -126,6 +126,12 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <properties>

diff --git a/modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java b/modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
@@ -80,26 +80,28 @@ public class BlueprintBasicTest {
   @Configuration
   public Option[] createConfiguration() {
     Option[] coreBundles = options(
-        mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-model").version("5.22.0"),
-        mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-converter").version("5.22.0"),
-        mavenBundle().groupId("org.activiti").artifactId("activiti-process-validation").version("5.22.0"),
-        mavenBundle().groupId("org.activiti").artifactId("activiti-image-generator").version("5.22.0"),
-        mavenBundle().groupId("org.activiti").artifactId("activiti-engine").version("5.22.0"),
-        mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version("3.3.2"),
-        mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.2.3"),
-        mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.2.3"),
-        mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version("2.2.3"),
-        mavenBundle().groupId("log4j").artifactId("log4j").version("1.2.17"),
-        mavenBundle().groupId("joda-time").artifactId("joda-time").version("2.6"),
-        mavenBundle().groupId("com.h2database").artifactId("h2").version("1.3.176"),
-        mavenBundle().groupId("org.mybatis").artifactId("mybatis").version("3.2.5"),
-        mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").version("1.7.6"),
-        mavenBundle().groupId("org.slf4j").artifactId("slf4j-log4j12").version("1.7.6").noStart(),
-        mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.fileinstall").version("3.0.2"),
-        mavenBundle().groupId("org.apache.aries.blueprint").artifactId("org.apache.aries.blueprint.core").version("1.0.0"),
-        mavenBundle().groupId("org.apache.aries.proxy").artifactId("org.apache.aries.proxy").version("1.0.0"),
-        mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version("1.0.0"),
-        mavenBundle().groupId("org.osgi").artifactId("org.osgi.enterprise").version("4.2.0"),
+            mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-model").version("5.22.0"),
+            mavenBundle().groupId("org.activiti").artifactId("activiti-bpmn-converter").version("5.22.0"),
+            mavenBundle().groupId("org.activiti").artifactId("activiti-process-validation").version("5.22.0"),
+            mavenBundle().groupId("org.activiti").artifactId("activiti-image-generator").version("5.22.0"),
+            mavenBundle().groupId("org.activiti").artifactId("activiti-engine").version("5.22.0"),
+
+            mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version("3.3.2"),
+            mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.7.5"),
+            mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.7.5"),
+            mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version("2.7.5"),
+            mavenBundle().groupId("log4j").artifactId("log4j").version("1.2.17"),
+            mavenBundle().groupId("joda-time").artifactId("joda-time").version("2.6"),
+            mavenBundle().groupId("com.h2database").artifactId("h2").version("1.3.176"),
+            mavenBundle().groupId("org.mybatis").artifactId("mybatis").version("3.3.0"),
+            mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").version("1.7.6"),
+            mavenBundle().groupId("org.slf4j").artifactId("slf4j-log4j12").version("1.7.6").noStart(),
+
+            mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.fileinstall").version("3.5.4"),
+            mavenBundle().groupId("org.apache.aries.blueprint").artifactId("org.apache.aries.blueprint.core").version("1.6.2"),
+            mavenBundle().groupId("org.apache.aries.proxy").artifactId("org.apache.aries.proxy").version("1.0.1"),
+            mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").version("1.1.1"),
+            mavenBundle().groupId("org.osgi").artifactId("org.osgi.enterprise").version("5.0.0"),
         bundle("reference:file:target/classes"));
 
     Option[] optionArray = OptionUtils.combine(coreBundles, CoreOptions.junitBundles(),
@@ -181,4 +183,4 @@ public void exportJavaDelegate() throws Exception {
             .singleResult();
     assertTrue((Boolean) activityBehaviourVisited.getValue());
   }
-}
+}
diff --git a/pom.xml b/pom.xml
@@ -371,19 +371,19 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
-        <version>4.2.0</version>
+        <version>6.0.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.compendium</artifactId>
-        <version>4.2.0</version>
+        <version>5.0.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.fileinstall</artifactId>
-        <version>3.0.2</version>
+        <version>3.5.4</version>
         <optional>true</optional>
       </dependency>
       <dependency>