From ae2029fae55e08ebf0cd3826c3c1b78342b6e4ae Mon Sep 17 00:00:00 2001 From: Matt Bishop Date: Tue, 1 Dec 2015 15:09:29 -0800 Subject: [PATCH 1/4] Replaced maven-bundle-plugin with jar manifest template. Picks up build-helper-maven-plugin config correctly. --- osgi-over-slf4j/pom.xml | 18 +----------------- .../src/main/resources/META-INF/MANIFEST.MF | 8 ++++++++ 2 files changed, 9 insertions(+), 17 deletions(-) create mode 100644 osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 7c38b36d..b7129043 100755 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -12,7 +12,7 @@ osgi-over-slf4j - bundle + jar OSGi LogService implemented over SLF4J http://www.slf4j.org @@ -41,20 +41,4 @@ provided - - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - true - - - org.osgi.service.log - org.slf4j.osgi.logservice.impl.Activator - - - - - diff --git a/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 00000000..3f9f8b18 --- /dev/null +++ b/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,8 @@ +Implementation-Title: osgi-over-slf4j +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.slf4j.osgi-over-slf4j +Bundle-Name: OSGi LogService implemented over SLF4J +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Activator: org.slf4j.osgi.logservice.impl.Activator +Export-Package: org.osgi.service.log;uses:="org.osgi.framework";version=${parsedVersion.osgiVersion} +Import-Package: org.osgi.framework;"[1.5,2)",org.osgi.service.log;version="[1.3,2)",org.slf4j;version=${parsedVersion.osgiVersion} From a4c645d18874ae7568a7ca8788ddd43bcfa67e27 Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Thu, 3 Dec 2015 19:31:23 +0100 Subject: [PATCH 2/4] revert REQUESTED_API_VERSION to 1.6.99 --- .../src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- .../src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- .../src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- .../src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index de74d1f0..89d4addc 100644 --- a/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-android/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -56,7 +56,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !final diff --git a/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index c60018cc..55d54813 100644 --- a/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -57,7 +57,7 @@ public class StaticLoggerBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !final private StaticLoggerBinder() { throw new UnsupportedOperationException("This code should have never made it into slf4j-api.jar"); diff --git a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 011a9437..84074cad 100644 --- a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -55,7 +55,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !final // Binding specific code: diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index c7375cd1..74c18936 100644 --- a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -56,7 +56,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !final private static final String loggerFactoryClassStr = org.slf4j.impl.JDK14LoggerFactory.class.getName(); diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index a14ca119..2ed8c6ef 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -58,7 +58,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !final private static final String loggerFactoryClassStr = Log4jLoggerFactory.class.getName(); diff --git a/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 90b13c7f..35fc464d 100644 --- a/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -57,7 +57,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !final private static final String loggerFactoryClassStr = NOPLoggerFactory.class.getName(); diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index e3859f34..23b6c874 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -57,7 +57,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is modified with each major release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.7.x"; // !final + public static String REQUESTED_API_VERSION = "1.6.99"; // !final private static final String loggerFactoryClassStr = SimpleLoggerFactory.class.getName(); From 6c461383d568611c27be92eb2e0167dc3b50e9bf Mon Sep 17 00:00:00 2001 From: Matt Bishop Date: Sat, 5 Dec 2015 21:13:41 -0800 Subject: [PATCH 3/4] Add Bundle-Category entry. Remove unnecessary Export-Package entry. --- osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF index 3f9f8b18..2df03c0b 100644 --- a/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF +++ b/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-SymbolicName: org.slf4j.osgi-over-slf4j Bundle-Name: OSGi LogService implemented over SLF4J Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Activator: org.slf4j.osgi.logservice.impl.Activator -Export-Package: org.osgi.service.log;uses:="org.osgi.framework";version=${parsedVersion.osgiVersion} +Bundle-Category: osgi Import-Package: org.osgi.framework;"[1.5,2)",org.osgi.service.log;version="[1.3,2)",org.slf4j;version=${parsedVersion.osgiVersion} From 3e749c3d6f5a4d74e31f49bd50956f3dbe3add76 Mon Sep 17 00:00:00 2001 From: Matt Bishop Date: Tue, 8 Dec 2015 15:29:27 -0800 Subject: [PATCH 4/4] Set framework version requirement --- osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF index 2df03c0b..73cebcfc 100644 --- a/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF +++ b/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-Name: OSGi LogService implemented over SLF4J Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Activator: org.slf4j.osgi.logservice.impl.Activator Bundle-Category: osgi -Import-Package: org.osgi.framework;"[1.5,2)",org.osgi.service.log;version="[1.3,2)",org.slf4j;version=${parsedVersion.osgiVersion} +Import-Package: org.osgi.framework;version="[1.5,2)",org.osgi.service.log;version="[1.3,2)",org.slf4j;version=${parsedVersion.osgiVersion}