You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ro...@apache.org on 2019/01/14 00:58:17 UTC
svn commit: r1851217 - in /felix/trunk/logback: logback/pom.xml
logback/src/main/java/org/apache/felix/logback/internal/Activator.java
logback/src/main/java/org/apache/felix/logback/internal/LogbackLogListener.java
pom.xml
Author: rotty3000
Date: Mon Jan 14 00:58:17 2019
New Revision: 1851217
URL: http://svn.apache.org/viewvc?rev=1851217&view=rev
Log:
FELIX-6027 Embed jul-to-slf4j bridge because who doesn't want jul fixed up properly
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
felix/trunk/logback/logback/pom.xml
felix/trunk/logback/logback/src/main/java/org/apache/felix/logback/internal/Activator.java
felix/trunk/logback/logback/src/main/java/org/apache/felix/logback/internal/LogbackLogListener.java
felix/trunk/logback/pom.xml
Modified: felix/trunk/logback/logback/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/logback/pom.xml?rev=1851217&r1=1851216&r2=1851217&view=diff
==============================================================================
--- felix/trunk/logback/logback/pom.xml (original)
+++ felix/trunk/logback/logback/pom.xml Mon Jan 14 00:58:17 2019
@@ -20,12 +20,11 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
<name>Apache Felix Logback Backend Integration</name>
<description>
A simple integration of the OSGi R7 Log (1.4) service to Logback backend.
@@ -65,20 +64,39 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.bundle</artifactId>
- <version>1.0.0</version>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.versioning</artifactId>
- <version>1.1.0</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>1.7.22</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>4.1.0</version>
+ <configuration>
+ <bnd><![CDATA[
+ Import-Package: !org.eclipse.osgi.internal.hookregistry, *
+ -conditionalpackage: org.slf4j.bridge
+ ]]></bnd>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -87,15 +105,12 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.5.0</version>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
- <Bundle-Activator>org.apache.felix.logback.internal.Activator</Bundle-Activator>
- <Import-Package>!org.eclipse.osgi.internal.hookregistry, *</Import-Package>
- </instructions>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
<plugin>
Modified: felix/trunk/logback/logback/src/main/java/org/apache/felix/logback/internal/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/logback/logback/src/main/java/org/apache/felix/logback/internal/Activator.java?rev=1851217&r1=1851216&r2=1851217&view=diff
==============================================================================
--- felix/trunk/logback/logback/src/main/java/org/apache/felix/logback/internal/Activator.java (original)
+++ felix/trunk/logback/logback/src/main/java/org/apache/felix/logback/internal/Activator.java Mon Jan 14 00:58:17 2019
@@ -16,15 +16,24 @@ package org.apache.felix.logback.interna
import java.util.AbstractMap.SimpleEntry;
+import org.osgi.annotation.bundle.Header;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogReaderService;
import org.osgi.service.log.admin.LoggerAdmin;
import org.osgi.util.tracker.ServiceTracker;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
+ static {
+ SLF4JBridgeHandler.removeHandlersForRootLogger();
+ SLF4JBridgeHandler.install();
+ }
+
private volatile ServiceTracker<LoggerAdmin, LRST> lat;
@Override
Modified: felix/trunk/logback/logback/src/main/java/org/apache/felix/logback/internal/LogbackLogListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/logback/logback/src/main/java/org/apache/felix/logback/internal/LogbackLogListener.java?rev=1851217&r1=1851216&r2=1851217&view=diff
==============================================================================
--- felix/trunk/logback/logback/src/main/java/org/apache/felix/logback/internal/LogbackLogListener.java (original)
+++ felix/trunk/logback/logback/src/main/java/org/apache/felix/logback/internal/LogbackLogListener.java Mon Jan 14 00:58:17 2019
@@ -24,7 +24,7 @@ import org.osgi.service.log.LogLevel;
import org.osgi.service.log.LogListener;
import org.osgi.service.log.admin.LoggerAdmin;
import org.slf4j.ILoggerFactory;
-import org.slf4j.impl.StaticLoggerBinder;
+import org.slf4j.LoggerFactory;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
@@ -52,7 +52,7 @@ public class LogbackLogListener implemen
osgiLoggerContext = loggerAdmin.getLoggerContext(null);
initialLogLevels = osgiLoggerContext.getLogLevels();
- ILoggerFactory loggerFactory = StaticLoggerBinder.getSingleton().getLoggerFactory();
+ ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory();
if (!(loggerFactory instanceof LoggerContext)) {
throw new IllegalStateException("This bundle only works with logback-classic");
Modified: felix/trunk/logback/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/pom.xml?rev=1851217&r1=1851216&r2=1851217&view=diff
==============================================================================
--- felix/trunk/logback/pom.xml (original)
+++ felix/trunk/logback/pom.xml Mon Jan 14 00:58:17 2019
@@ -38,7 +38,7 @@
</scm>
<properties>
- <bnd.version>4.0.0</bnd.version>
+ <bnd.version>4.1.0</bnd.version>
</properties>
<modules>