Merge pull request #7555 from enonic/issue-7374

Update OSGi to version 7 #7374

buildSrc/build.gradle

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    compile 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.2.0'
+    compile 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.0'
     compile 'com.moowork.gradle:gradle-node-plugin:1.0.1'
     compile 'org.eclipse.jgit:org.eclipse.jgit:3.7.0.201502260915-r'
     compile 'com.gradle.publish:plugin-publish-plugin:0.9.3'

gradle/java.gradle

@@ -18,7 +18,7 @@ configurations {
 }
 
 ext {
-    felixVersion = '6.0.1'
+    felixVersion = '6.0.3'
     jettyVersion = '9.4.21.v20190926'
 }
 

modules/core/core-api/build.gradle

@@ -7,8 +7,8 @@ dependencies {
     compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.6'
     compile 'org.jparsec:jparsec:3.1'
     compile 'commons-io:commons-io:2.4'
-    compile 'org.osgi:osgi.core:6.0.0'
-    compile 'org.osgi:osgi.cmpn:6.0.0'
+    compile 'org.osgi:osgi.core:7.0.0'
+    compile 'org.osgi:osgi.cmpn:7.0.0'
     compile 'org.slf4j:slf4j-api:1.7.25'
     compile 'javax.mail:mail:1.4.7'
     compile 'io.dropwizard.metrics:metrics-core:3.1.2'

modules/launcher/launcher-impl/build.gradle

@@ -3,14 +3,11 @@ 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
-    }
+    runtimeOnly 'org.apache.felix:org.apache.felix.logback:1.0.2'
+    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'
-    compile 'org.slf4j:jcl-over-slf4j:1.7.25'
-    compile 'org.slf4j:log4j-over-slf4j:1.7.25'
+    runtimeOnly 'ch.qos.logback:logback-classic:1.2.3'
+    compile 'org.slf4j:slf4j-api:1.7.25'
     compile 'org.fusesource.jansi:jansi:1.11'
     compile 'javax.mail:mail:1.4.7'
 }

modules/launcher/launcher-impl/src/main/java/com/enonic/xp/launcher/impl/LauncherImpl.java

@@ -13,8 +13,6 @@
 import com.enonic.xp.launcher.impl.env.RequirementChecker;
 import com.enonic.xp.launcher.impl.env.SystemProperties;
 import com.enonic.xp.launcher.impl.framework.FrameworkService;
-import com.enonic.xp.launcher.impl.logging.LogActivator;
-import com.enonic.xp.launcher.impl.logging.LogConfigurator;
 import com.enonic.xp.launcher.impl.provision.ProvisionActivator;
 import com.enonic.xp.launcher.impl.util.BannerPrinter;
 
@@ -82,28 +80,15 @@ private void applyConfigToSystemProperties()
         }
     }
 
-    private void setupLogging()
-    {
-        final LogConfigurator configurator = new LogConfigurator( this.env );
-        configurator.configure();
-    }
-
     private void createFramework()
     {
         this.framework = new FrameworkService();
         this.framework.listener( this.listener );
         this.framework.config( this.config );
 
-        addLogActivator();
         addProvisionActivator();
     }
 
-    private void addLogActivator()
-    {
-        final LogActivator activator = new LogActivator();
-        this.framework.activator( activator );
-    }
-
     private void addProvisionActivator()
     {
         final File systemDir = new File( this.env.getInstallDir(), "system" );
@@ -117,7 +102,6 @@ public void start()
     {
         resolveEnv();
         printBanner();
-        setupLogging();
         loadConfiguration();
         applyConfigToSystemProperties();
         createFramework();

modules/launcher/launcher-impl/src/main/resources/META-INF/config/system.properties

@@ -16,6 +16,7 @@ xp.osgi.startlevel.bundle = 60
 # Log settings
 #
 felix.log.level = 1
+logback.configurationFile=${xp.home}/config/logback.xml
 
 #
 # Configuration FileMonitor properties