From f694a346f5ee8e30ddd01a0f6752cf182f36a5e5 Mon Sep 17 00:00:00 2001
From: "John E. Conlon" <jconlon@verticon.com>
Date: Wed, 28 Feb 2007 20:56:15 +0000
Subject: [PATCH] Updated OSGi metadata to support version 1.3.1

---
 jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF    | 3 +--
 slf4j-api/src/main/resources/META-INF/MANIFEST.MF            | 4 ++--
 slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF            | 4 ++--
 slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF          | 5 ++---
 slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF        | 4 ++--
 slf4j-nop/src/main/resources/META-INF/MANIFEST.MF            | 4 ++--
 .../org/slf4j/osgi/integration/IntegrationTestConstants.java | 2 +-
 slf4j-simple/src/main/resources/META-INF/MANIFEST.MF         | 4 ++--
 8 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
index 488a79e9..06233ac8 100644
--- a/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
+++ b/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: jcl104.over.slf4j
 Bundle-Name: jcl104-over-slf4j
 Bundle-Vendor: SLF4J.ORG
-Require-Bundle: slf4j.api;version=1.3
 Export-Package: org.apache.commons.logging, 
   org.apache.commons.logging.impl
-Import-Package: org.slf4j;version=1.3
+Import-Package: org.slf4j;version="[1.3,1.4)", org.slf4j.spi;version="[1.3,1.4)"
diff --git a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
index 86cbef15..d572f5c9 100644
--- a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: slf4j.api
 Bundle-Name: slf4j-api
 Bundle-Vendor: SLF4J.ORG
-Export-Package: org.slf4j;version=1.3, org.slf4j.spi;version=1.3, org.slf4j.helpers;version=1.3
-Import-Package: org.slf4j.impl;version=1.3
+Export-Package: org.slf4j;version=1.3.1, org.slf4j.spi;version=1.3.1, org.slf4j.helpers;version=1.3.1
+Import-Package: org.slf4j.impl;version="[1.3,1.4)"
diff --git a/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
index de5303c5..013468b2 100644
--- a/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@ Bundle-SymbolicName: slf4j.jcl
 Bundle-Name: slf4j-jcl
 Bundle-Vendor: SLF4J.ORG
 Require-Bundle: slf4j.api
-Export-Package: org.slf4j.impl;version=1.3
-Import-Package: org.slf4j.spi;version=1.3, org.slf4j.helpers;version=1.3, org.apache.commons.logging
+Export-Package: org.slf4j.impl;version=1.3.1
+Import-Package: org.slf4j.spi;version="[1.3,1.4)", org.slf4j.helpers;version="[1.3,1.4)", org.apache.commons.logging
diff --git a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
index 150ef8c9..4d05078c 100644
--- a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
@@ -3,6 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: slf4j.jdk14
 Bundle-Name: slf4j-jdk14
 Bundle-Vendor: SLF4J.ORG
-Require-Bundle: slf4j.api
-Export-Package: org.slf4j.impl;version=1.3
-Import-Package: org.slf4j;version=1.3, org.slf4j.spi;version=1.3, org.slf4j.helpers;version=1.3
+Export-Package: org.slf4j.impl;version=1.3.1
+Import-Package: org.slf4j;version="[1.3,1.4)", org.slf4j.spi;version="[1.3,1.4)", org.slf4j.helpers;version="[1.3,1.4)"
diff --git a/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF b/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
index 4aa80476..2617f427 100644
--- a/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: slf4j.log4j12
 Bundle-Name: slf4j-log4j12
 Bundle-Vendor: SLF4J.ORG
-Export-Package: org.slf4j.impl;version=1.3
-Import-Package: org.slf4j;version=1.3, org.slf4j.spi;version=1.3, org.slf4j.helpers;version=1.3, org.apache.log4j
+Export-Package: org.slf4j.impl;version=1.3.1
+Import-Package: org.slf4j;version="[1.3,1.4)", org.slf4j.spi;version="[1.3,1.4)", org.slf4j.helpers;version="[1.3,1.4)", org.apache.log4j
diff --git a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
index 5c0f4173..a3834fa3 100644
--- a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: slf4j.nop
 Bundle-Name: slf4j-nop
 Bundle-Vendor: SLF4J.ORG
-Export-Package: org.slf4j.impl;version=1.3
-Import-Package: org.slf4j;version=1.3, org.slf4j.spi;version=1.3, org.slf4j.helpers;version=1.3
+Export-Package: org.slf4j.impl;version=1.3.1
+Import-Package: org.slf4j;version="[1.3,1.4)", org.slf4j.spi;version="[1.3,1.4)", org.slf4j.helpers;version="[1.3,1.4)"
diff --git a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java b/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java
index 76f28de4..072189e7 100644
--- a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java
+++ b/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java
@@ -36,7 +36,7 @@ public interface IntegrationTestConstants {
     /**
      * Versions of this release.
      */
-    public static final String SLF4J_VERSION_UNDER_TEST = "1.3.0-SNAPSHOT";
+    public static final String SLF4J_VERSION_UNDER_TEST = "1.3.1-SNAPSHOT";
     
     public static final String SLF4J_GROUP_ID = "org.slf4j";
     
diff --git a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
index d4ea6359..7ae0549b 100644
--- a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@ Bundle-SymbolicName: slf4j.simple
 Bundle-Name: slf4j-simple
 Bundle-Vendor: SLF4J.ORG
 Require-Bundle: slf4j.api
-Export-Package: org.slf4j.impl;version=1.3
-Import-Package: org.slf4j;version=1.3, org.slf4j.spi;version=1.3, org.slf4j.helpers;version=1.3
+Export-Package: org.slf4j.impl;version=1.3.1
+Import-Package: org.slf4j;version="[1.3,1.4)", org.slf4j.spi;version="[1.3,1.4)", org.slf4j.helpers;version="[1.3,1.4)"