Author: ceki
Date: Mon Aug 20 23:27:47 2007
New Revision: 876
Modified:
slf4j/trunk/jcl104-over-slf4j/pom.xml
slf4j/trunk/pom.xml
slf4j/trunk/slf4j-api/pom.xml
slf4j/trunk/slf4j-jcl/pom.xml
slf4j/trunk/slf4j-jdk14/pom.xml
slf4j/trunk/slf4j-log4j12/pom.xml
slf4j/trunk/slf4j-nop/pom.xml
slf4j/trunk/slf4j-simple/pom.xml
Log:
attempt to fix the lack of propagation of project variables in the MANIFEST.MF
file
Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/pom.xml (original)
+++ slf4j/trunk/jcl104-over-slf4j/pom.xml Mon Aug 20 23:27:47 2007
@@ -36,11 +36,11 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${pv4osgi}</Bundle-Version>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
-
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml (original)
+++ slf4j/trunk/pom.xml Mon Aug 20 23:27:47 2007
@@ -20,7 +20,7 @@
<properties>
<!-- <project_version_for_osgi>1.3.0</project_version_for_osgi> -->
- <pv4osgi>1.3.1</pv4osgi>
+ <pv4osgi>1.4.3</pv4osgi>
</properties>
<modules>
@@ -72,6 +72,7 @@
<filtering>true</filtering>
</resource>
</resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: slf4j/trunk/slf4j-api/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-api/pom.xml (original)
+++ slf4j/trunk/slf4j-api/pom.xml Mon Aug 20 23:27:47 2007
@@ -24,6 +24,7 @@
</dependencies>
<build>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -45,11 +46,11 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${pv4osgi}</Bundle-Version>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
-
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
<executions>
Modified: slf4j/trunk/slf4j-jcl/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jcl/pom.xml (original)
+++ slf4j/trunk/slf4j-jcl/pom.xml Mon Aug 20 23:27:47 2007
@@ -42,11 +42,11 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${pv4osgi}</Bundle-Version>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
-
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
Modified: slf4j/trunk/slf4j-jdk14/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jdk14/pom.xml (original)
+++ slf4j/trunk/slf4j-jdk14/pom.xml Mon Aug 20 23:27:47 2007
@@ -48,11 +48,11 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${pv4osgi}</Bundle-Version>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
-
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
Modified: slf4j/trunk/slf4j-log4j12/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-log4j12/pom.xml (original)
+++ slf4j/trunk/slf4j-log4j12/pom.xml Mon Aug 20 23:27:47 2007
@@ -43,11 +43,11 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${pv4osgi}</Bundle-Version>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
-
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
Modified: slf4j/trunk/slf4j-nop/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-nop/pom.xml (original)
+++ slf4j/trunk/slf4j-nop/pom.xml Mon Aug 20 23:27:47 2007
@@ -38,11 +38,11 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${pv4osgi}</Bundle-Version>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
-
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
Modified: slf4j/trunk/slf4j-simple/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-simple/pom.xml (original)
+++ slf4j/trunk/slf4j-simple/pom.xml Mon Aug 20 23:27:47 2007
@@ -33,11 +33,11 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${pv4osgi}</Bundle-Version>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
-
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
_______________________________________________
dev mailing list
[email protected]
http://www.slf4j.org/mailman/listinfo/dev
