Author: ceki
Date: Mon Aug 20 20:10:22 2007
New Revision: 867
Removed:
slf4j/trunk/slf4j-archetype/
Modified:
slf4j/trunk/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/osgi-over-slf4j/pom.xml
slf4j/trunk/pom.xml
slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
Log:
- removed slf4j-archetype
- MANIFEST.MF files use ${project.version} as a variable in order to
keep project version changes and the OSGI manifest in sync
Modified: slf4j/trunk/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ slf4j/trunk/jcl104-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
Mon Aug 20 20:10:22 2007
@@ -5,4 +5,4 @@
Bundle-Vendor: SLF4J.ORG
Export-Package: org.apache.commons.logging,
org.apache.commons.logging.impl
-Import-Package: org.slf4j;version="[1.3,1.4)",
org.slf4j.spi;version="[1.3,1.4)"
+Import-Package: org.slf4j;version=${project.version},
org.slf4j.spi;version=${project.version}
Modified: slf4j/trunk/osgi-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/osgi-over-slf4j/pom.xml (original)
+++ slf4j/trunk/osgi-over-slf4j/pom.xml Mon Aug 20 20:10:22 2007
@@ -50,7 +50,7 @@
<configuration>
<instructions>
<Export-Package>org.osgi.service.log</Export-Package>
- <Import-Package>org.slf4j;version="[1.3,1.4)",*</Import-Package>
+
<Import-Package>org.slf4j;version=${project.version},*</Import-Package>
<Private-Package>org.slf4j.osgi.logservice.impl</Private-Package>
<Bundle-Activator>org.slf4j.osgi.logservice.impl.Activator</Bundle-Activator>
</instructions>
Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml (original)
+++ slf4j/trunk/pom.xml Mon Aug 20 20:10:22 2007
@@ -33,7 +33,6 @@
<module>jcl104-over-slf4j</module>
<module>log4j-over-slf4j</module>
<module>slf4j-site</module>
- <module>slf4j-archetype</module>
<module>slf4j-converter</module>
</modules>
@@ -67,6 +66,12 @@
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF Mon Aug
20 20:10:22 2007
@@ -3,5 +3,5 @@
Bundle-SymbolicName: slf4j.api
Bundle-Name: slf4j-api
Bundle-Vendor: SLF4J.ORG
-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)"
+Export-Package: org.slf4j;version=${project.version},
org.slf4j.spi;version=${project.version},
org.slf4j.helpers;version=${project.version}
+Import-Package: org.slf4j.impl;version=${project.version}
Modified: slf4j/trunk/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ slf4j/trunk/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF Mon Aug
20 20:10:22 2007
@@ -4,5 +4,5 @@
Bundle-Name: slf4j-jcl
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api
-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
+Export-Package: org.slf4j.impl;version=${project.version}
+Import-Package: org.slf4j.spi;version=${project.version},
org.slf4j.helpers;version=${project.version}, org.apache.commons.logging
Modified: slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF Mon Aug
20 20:10:22 2007
@@ -3,5 +3,5 @@
Bundle-SymbolicName: slf4j.jdk14
Bundle-Name: slf4j-jdk14
Bundle-Vendor: SLF4J.ORG
-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)"
+Export-Package: org.slf4j.impl;version=${project.version}
+Import-Package: org.slf4j;version=${project.version},
org.slf4j.spi;version=${project.version},
org.slf4j.helpers;version=${project.version}
Modified: slf4j/trunk/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ slf4j/trunk/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF Mon Aug
20 20:10:22 2007
@@ -3,5 +3,5 @@
Bundle-SymbolicName: slf4j.log4j12
Bundle-Name: slf4j-log4j12
Bundle-Vendor: SLF4J.ORG
-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
+Export-Package: org.slf4j.impl;version=${project.version}
+Import-Package: org.slf4j;version=${project.version},
org.slf4j.spi;version=${project.version},
org.slf4j.helpers;version=${project.version}, org.apache.log4j
Modified: slf4j/trunk/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ slf4j/trunk/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF Mon Aug
20 20:10:22 2007
@@ -3,5 +3,5 @@
Bundle-SymbolicName: slf4j.nop
Bundle-Name: slf4j-nop
Bundle-Vendor: SLF4J.ORG
-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)"
+Export-Package: org.slf4j.impl;version=${project.version}
+Import-Package: org.slf4j;version=${project.version},
org.slf4j.spi;version=${project.version},
org.slf4j.helpers;version=${project.version}
Modified: slf4j/trunk/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ slf4j/trunk/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF Mon Aug
20 20:10:22 2007
@@ -4,5 +4,5 @@
Bundle-Name: slf4j-simple
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api
-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)"
+Export-Package: org.slf4j.impl;version=${project.version}
+Import-Package: org.slf4j;version=${project.version},
org.slf4j.spi;version=${project.version},
org.slf4j.helpers;version=${project.version}
_______________________________________________
dev mailing list
[email protected]
http://www.slf4j.org/mailman/listinfo/dev
