[KARAF-5770] OSGi R7 Support

lsaikrishna89 · Jan 24, 2020 · 8b10e76 · 8b10e76
1 parent 2bc547f
commit 8b10e76
Show file tree

Hide file tree

Showing 49 changed files with 259 additions and 87 deletions.
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
@@ -57,11 +57,11 @@ karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/@@felix.f
 # Framework config properties.
 #
 org.osgi.framework.system.packages= \
- org.osgi.dto;version="1.0",\
+ org.osgi.dto;version="1.1",\
  org.osgi.resource;version="1.0",\
  org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\
- org.osgi.framework;version="1.8",\
- org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",\
+ org.osgi.framework;version="1.9",\
+ org.osgi.framework.dto;version="1.9";uses:="org.osgi.dto",\
  org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",\
  org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",\
  org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",\
@@ -71,13 +71,13 @@ org.osgi.framework.system.packages= \
  org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",\
  org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",\
  org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",\
- org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",\
+ org.osgi.framework.wiring.dto;version="1.3";uses:="org.osgi.dto,org.osgi.resource.dto",\
  org.osgi.service.condpermadmin;version="1.1.1";uses:="org.osgi.framework,org.osgi.service.permissionadmin",\
  org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",org.osgi.service.permissionadmin;version="1.2",\
- org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",\
+ org.osgi.service.resolver;version="1.1";uses:="org.osgi.resource",\
  org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",\
  org.osgi.service.url;version="1.0",\
- org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework",\
+ org.osgi.util.tracker;version="1.5.2";uses:="org.osgi.framework",\
  org.apache.karaf.version;version="@@karaf.osgi.version@@",\
  org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="@@karaf.osgi.version@@",\
  org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="@@karaf.osgi.version@@",\

diff --git a/assemblies/features/static/pom.xml b/assemblies/features/static/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <artifactId>pax-logging-log4j1</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.services</groupId>

diff --git a/audit/pom.xml b/audit/pom.xml
@@ -104,6 +104,7 @@
                         <Export-Package>
                         </Export-Package>
                         <Import-Package>
+                            org.osgi.framework;version="[1,3)",
                             *
                         </Import-Package>
                         <Private-Package>

diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml
@@ -126,6 +126,10 @@
                         <Export-Package>
                             org.apache.karaf.bundle.core;-noimport:=true
                         </Export-Package>
+                        <Import-Package>
+                            org.osgi.framework;version="[1,3)",
+                            *
+                        </Import-Package>
                         <Private-Package>
                             org.apache.karaf.bundle.command*,
                             org.apache.karaf.bundle.core.internal,

diff --git a/config/pom.xml b/config/pom.xml
@@ -106,6 +106,7 @@
                         </Export-Package>
                         <Import-Package>
                             org.osgi.service.metatype;resolution:=optional,
+                            org.osgi.framework;version="[1,3)",
                             *
                         </Import-Package>
                         <Private-Package>

diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml
@@ -101,6 +101,10 @@
                 <configuration>
                     <instructions>
                         <Export-Package />
+                        <Import-Package>
+                            org.osgi.framework;version="[1,3)",
+                            *
+                        </Import-Package>
                         <Private-Package>
                             org.apache.karaf.deployer.features,
                             org.apache.karaf.deployer.features.osgi,

diff --git a/diagnostic/boot/pom.xml b/diagnostic/boot/pom.xml
@@ -65,6 +65,7 @@
                         <Import-Package>
                             com.sun.management;resolution:=optional,
                             sun.misc;resolution:=optional,
+                            org.osgi.framework;version="[1,3)",
                             *
                         </Import-Package>
                         <Karaf-Activator>

diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml
@@ -105,6 +105,7 @@
                        	</Export-Package>
                         <Import-Package>
                             com.sun.management*;resolution:=optional,
+                            org.osgi.framework;version="[1,3)",
                             *
                         </Import-Package>
                         <Private-Package>

diff --git a/docker/pom.xml b/docker/pom.xml
@@ -99,6 +99,7 @@
                         </Export-Package>
                         <Import-Package>
                             com.fasterxml.jackson*;version="[2,3)",
+                            org.osgi.framework;version="[1,3)",
                             *
                         </Import-Package>
                         <Private-Package>

diff --git a/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml b/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml
@@ -35,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <artifactId>pax-logging-log4j1</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -52,7 +52,7 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            org.ops4j.pax.logging*;version="[1.7,2)",
+                            org.ops4j.pax.logging*;version="[1,3)",
                             *
                         </Import-Package>
                     </instructions>

diff --git a/features/core/pom.xml b/features/core/pom.xml
@@ -166,6 +166,8 @@
                         <Import-Package>
                             !org.eclipse.osgi.service.resolver,
                             javax.xml.bind*;version="[2.2,3)",
+                            org.osgi.framework*;version="[1,3)",
+                            org.osgi.service.resolver;version="[1,3)",
                             *
                         </Import-Package>
                         <Private-Package>

diff --git a/http/pom.xml b/http/pom.xml
@@ -110,6 +110,10 @@
                         <Export-Package>
                             org.apache.karaf.http.core
                         </Export-Package>
+                        <Import-Package>
+                            org.osgi.framework;version="[1,3)",
+                            *
+                        </Import-Package>
                         <Private-Package>
                             org.apache.karaf.util.tracker;-split-package:=merge-first,
                             org.apache.karaf.http.command,

diff --git a/instance/pom.xml b/instance/pom.xml
@@ -208,6 +208,7 @@
                         <Import-Package>
                             !org.apache.karaf.shell.impl.action.command,
                             !org.apache.karaf.instance.core.internal,
+                            org.osgi.framework;version="[1,3)",
                             *
                         </Import-Package>
                         <Private-Package>

diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
@@ -57,11 +57,11 @@ karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/@@felix.f
 # Framework config properties.
 #
 org.osgi.framework.system.packages= \
- org.osgi.dto;version="1.0",\
+ org.osgi.dto;version="1.1",\
  org.osgi.resource;version="1.0",\
  org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\
- org.osgi.framework;version="1.8",\
- org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",\
+ org.osgi.framework;version="1.9",\
+ org.osgi.framework.dto;version="1.9";uses:="org.osgi.dto",\
  org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",\
  org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",\
  org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",\
@@ -71,13 +71,13 @@ org.osgi.framework.system.packages= \
  org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",\
  org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",\
  org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",\
- org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",\
+ org.osgi.framework.wiring.dto;version="1.3";uses:="org.osgi.dto,org.osgi.resource.dto",\
  org.osgi.service.condpermadmin;version="1.1.1";uses:="org.osgi.framework,org.osgi.service.permissionadmin",\
  org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",org.osgi.service.permissionadmin;version="1.2",\
- org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",\
+ org.osgi.service.resolver;version="1.1";uses:="org.osgi.resource",\
  org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",\
  org.osgi.service.url;version="1.0",\
- org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework",\
+ org.osgi.util.tracker;version="1.5.2";uses:="org.osgi.framework",\
  org.apache.karaf.version;version="@@karaf.osgi.version@@",\
  org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="@@karaf.osgi.version@@",\
  org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="@@karaf.osgi.version@@",\

diff --git a/itests/test/src/test/filtered-resources/etc/config.properties b/itests/test/src/test/filtered-resources/etc/config.properties
@@ -57,11 +57,11 @@ karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/@@felix.f
 # Framework config properties.
 #
 org.osgi.framework.system.packages= \
- org.osgi.dto;version="1.0",\
+ org.osgi.dto;version="1.1",\
  org.osgi.resource;version="1.0",\
  org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\
- org.osgi.framework;version="1.8",\
- org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",\
+ org.osgi.framework;version="1.9",\
+ org.osgi.framework.dto;version="1.9";uses:="org.osgi.dto",\
  org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",\
  org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",\
  org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",\
@@ -71,13 +71,13 @@ org.osgi.framework.system.packages= \
  org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",\
  org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",\
  org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",\
- org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",\
+ org.osgi.framework.wiring.dto;version="1.3";uses:="org.osgi.dto,org.osgi.resource.dto",\
  org.osgi.service.condpermadmin;version="1.1.1";uses:="org.osgi.framework,org.osgi.service.permissionadmin",\
  org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",org.osgi.service.permissionadmin;version="1.2",\
- org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",\
+ org.osgi.service.resolver;version="1.1";uses:="org.osgi.resource",\
  org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",\
  org.osgi.service.url;version="1.0",\
- org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework",\
+ org.osgi.util.tracker;version="1.5.2";uses:="org.osgi.framework",\
  org.apache.karaf.version;version="@@karaf.osgi.version@@",\
  org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="@@karaf.osgi.version@@",\
  org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="@@karaf.osgi.version@@",\

diff --git a/itests/test/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java b/itests/test/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
@@ -45,11 +45,6 @@ public void checkInstalledFeaturesBoot() throws Exception {
         assertFeatureInstalled("service");
         assertFeatureInstalled("system");
     }
-
-    @Test
-    public void installFrameworkSecurityFeature() throws Exception {
-        installAssertAndUninstallFeatures("framework-security");
-    }
 
     public void installServiceSecurityFeature() throws Exception {
         System.out.println("===>installServiceSecurityFeature");

diff --git a/jaas/config/pom.xml b/jaas/config/pom.xml
@@ -103,6 +103,7 @@
                         </Export-Package>
                         <Import-Package>
                             !${project.artifactId}.*,
+                            org.osgi.framework;version="[1,3)",
                             *
                         </Import-Package>
                         <Private-Package>

diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml
@@ -147,6 +147,7 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
+                            org.osgi.framework;version="[1,3)",
                             *
                         </Import-Package>
                         <Private-Package>

diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
@@ -166,6 +166,7 @@
                             javax.net,
                             org.apache.karaf.jaas.config,
                             org.osgi.service.event;resolution:=optional,
+                            org.osgi.framework;version="[1,3)",
                             !net.sf.ehcache*,
                             !net.spy.memcached*,
                             com.sun.security.auth.module;resolution:=optional,

diff --git a/jdbc/pom.xml b/jdbc/pom.xml
@@ -89,6 +89,10 @@
                         <Export-Package>
                             org.apache.karaf.jdbc
                         </Export-Package>
+                        <Import-Package>
+                            org.osgi.framework;version="[1,3)",
+                            *
+                        </Import-Package>
                         <Private-Package>
                             org.apache.karaf.jdbc.command,
                             org.apache.karaf.jdbc.command.ds,

diff --git a/jms/pom.xml b/jms/pom.xml
@@ -113,6 +113,7 @@
                         <Import-Package>
                             javax.jms;version="[1.1,3)",
                             org.apache.activemq*;resolution:=optional,
+                            org.osgi.framework;version="[1,3)",
                             *
                         </Import-Package>
                         <Private-Package>

diff --git a/jndi/pom.xml b/jndi/pom.xml
@@ -92,6 +92,10 @@
                         <Export-Package>
                             org.apache.karaf.jndi
                         </Export-Package>
+                        <Import-Package>
+                            org.osgi.framework;version="[1,3)",
+                            *
+                        </Import-Package>
                         <Private-Package>
                             org.apache.karaf.jndi.command,
                             org.apache.karaf.jndi.command.completers,

diff --git a/kar/pom.xml b/kar/pom.xml
@@ -113,6 +113,10 @@
                         <Export-Package>
                             org.apache.karaf.kar
                         </Export-Package>
+                        <Import-Package>
+                            org.osgi.framework;version="[1,3)",
+                            *
+                        </Import-Package>
                         <Private-Package>
                             org.apache.karaf.kar.command,
                             org.apache.karaf.kar.command.completers,

diff --git a/log/pom.xml b/log/pom.xml
@@ -108,6 +108,7 @@
                             org.apache.karaf.log.core
                         </Export-Package>
                         <Import-Package>
+                            org.osgi.framework;version="[1,3)",
                             *
                         </Import-Package>
                         <Private-Package>

diff --git a/log/src/main/java/org/apache/karaf/log/core/internal/LogEventFormatterImpl.java b/log/src/main/java/org/apache/karaf/log/core/internal/LogEventFormatterImpl.java
@@ -23,17 +23,18 @@
 import org.apache.karaf.log.core.internal.layout.PatternConverter;
 import org.apache.karaf.log.core.internal.layout.PatternParser;
 import org.ops4j.pax.logging.spi.PaxLoggingEvent;
+import org.osgi.service.log.LogLevel;
 
 public class LogEventFormatterImpl implements LogEventFormatter {
 
     private String pattern;
-    private Map<Integer, String> level2Color = new HashMap<>();
+    private Map<LogLevel, String> level2Color = new HashMap<>();
 
     public void setPattern(String pattern) {
         this.pattern = pattern;
     }
 
-    public void setColor(int level, String color) {
+    public void setColor(LogLevel level, String color) {
         if (color != null && color.length() > 0) {
             this.level2Color.put(level, color);
         } else {
@@ -73,7 +74,7 @@ private void color(StringBuffer sb, String color) {
 
     private String getColor(PaxLoggingEvent event, boolean noColor) {
         if (!noColor && event != null && event.getLevel() != null && event.getLevel().toString() != null) {
-            return level2Color.get(event.getLevel().toInt());
+            return level2Color.get(event.getLevel());
         } else {
             return null;
         }

diff --git a/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java b/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java
@@ -28,6 +28,7 @@
 import org.ops4j.pax.logging.PaxLogger;
 import org.ops4j.pax.logging.spi.PaxLocationInfo;
 import org.ops4j.pax.logging.spi.PaxLoggingEvent;
+import org.osgi.service.log.LogLevel;
 
 /**
  * Copied from log4j
@@ -559,22 +560,20 @@ private String createSequence(String... names) {
     public
     String convert(PaxLoggingEvent event) {
       String s;
-      switch (event.getLevel().toInt()) {
-        case PaxLogger.LEVEL_TRACE:
-          s = "trace";
-          break;
-        case PaxLogger.LEVEL_DEBUG:
-          s = "debug";
-          break;
-        case PaxLogger.LEVEL_INFO:
-          s = "info";
-          break;
-        case PaxLogger.LEVEL_WARNING:
-          s = "warn";
-          break;
-        default:
-          s = "error";
-          break;
+      if (event.getLevel().toLevel().equals(LogLevel.TRACE)) {
+        s = "trace";
+      } else if (event.getLevel().toLevel().equals(LogLevel.DEBUG)) {
+        s = "debug";
+      } else if (event.getLevel().toLevel().equals(LogLevel.INFO)) {
+        s = "info";
+      } else if (event.getLevel().toLevel().equals(LogLevel.WARN)) {
+        s = "warn";
+      } else if (event.getLevel().toLevel().equals(LogLevel.ERROR)) {
+        s = "error";
+      } else if (event.getLevel().toLevel().equals(LogLevel.AUDIT)) {
+        s = "audit";
+      } else {
+        s = "error";
       }
       String str = style.get(s);
       if (str != null) {

diff --git a/log/src/main/java/org/apache/karaf/log/core/internal/osgi/Activator.java b/log/src/main/java/org/apache/karaf/log/core/internal/osgi/Activator.java
@@ -32,6 +32,7 @@
 import org.ops4j.pax.logging.spi.PaxAppender;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.ManagedService;
+import org.osgi.service.log.LogLevel;
 
 @Services(
         requires = @RequireService(ConfigurationAdmin.class),
@@ -56,11 +57,12 @@ protected void doStart() throws Exception {
 
         LogEventFormatterImpl formatter = new LogEventFormatterImpl();
         formatter.setPattern(pattern);
-        formatter.setColor(PaxLogger.LEVEL_ERROR, errorColor);
-        formatter.setColor(PaxLogger.LEVEL_WARNING, warnColor);
-        formatter.setColor(PaxLogger.LEVEL_INFO, infoColor);
-        formatter.setColor(PaxLogger.LEVEL_DEBUG, debugColor);
-        formatter.setColor(PaxLogger.LEVEL_TRACE, traceColor);
+        formatter.setColor(LogLevel.ERROR, errorColor);
+        formatter.setColor(LogLevel.WARN, warnColor);
+        formatter.setColor(LogLevel.INFO, infoColor);
+        formatter.setColor(LogLevel.DEBUG, debugColor);
+        formatter.setColor(LogLevel.TRACE, traceColor);
+        formatter.setColor(LogLevel.AUDIT, traceColor);
         register(LogEventFormatter.class, formatter);
 
         LogServiceImpl logService = new LogServiceImpl(configurationAdmin, size);