Update Apache Felix to version 6.0.3 #7374

enonic · Oct 28, 2019 · 1a3b390 · 1a3b390
1 parent a3689df
commit 1a3b390
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -18,7 +18,7 @@ configurations {
 }
 
 ext {
-    felixVersion = '6.0.1'
+    felixVersion = '6.0.3'
     jettyVersion = '9.4.21.v20190926'
     igniteVersion = '2.7.6'
 }

diff --git a/modules/launcher/launcher-impl/build.gradle b/modules/launcher/launcher-impl/build.gradle
@@ -3,9 +3,7 @@ dependencies {
     compile 'org.osgi:osgi.core:7.0.0'
     compile 'org.osgi:osgi.cmpn:7.0.0'
     compile "org.apache.felix:org.apache.felix.framework:${felixVersion}"
-    compile( 'org.apache.felix:org.apache.felix.utils:1.11.0' ) {
-        transitive = false
-    }
+    compile 'org.apache.felix:org.apache.felix.utils:1.11.2'
     compile 'commons-io:commons-io:2.4'
     compile 'ch.qos.logback:logback-classic:1.2.3'
     compile 'org.slf4j:jul-to-slf4j:1.7.25'

diff --git a/modules/runtime/build.gradle b/modules/runtime/build.gradle
@@ -22,10 +22,10 @@ addBundle( 'com.sun.xml.bind:jaxb-core:2.2.11', 4 )
 addBundle( 'com.sun.xml.bind:jaxb-impl:2.2.11', 4 )
 
 // Core bundles
-addBundle( 'org.apache.felix:org.apache.felix.metatype:1.1.2', 5 )
-addBundle( 'org.apache.felix:org.apache.felix.eventadmin:1.4.4', 5 )
-addBundle( 'org.apache.felix:org.apache.felix.configadmin:1.8.8', 5 )
-addBundle( 'org.apache.felix:org.apache.felix.scr:2.0.2', 5 )
+addBundle( 'org.apache.felix:org.apache.felix.metatype:1.2.2', 5 )
+addBundle( 'org.apache.felix:org.apache.felix.eventadmin:1.5.0', 5 )
+addBundle( 'org.apache.felix:org.apache.felix.configadmin:1.9.16', 5 )
+addBundle( 'org.apache.felix:org.apache.felix.scr:2.1.16', 5 )
 
 addBundle( 'org.slf4j:slf4j-api:1.7.25', 5 )
 addBundle( 'ch.qos.logback:logback-core:1.2.3', 5 )