mirror of https://github.com/qos-ch/slf4j
attempt to fix the lack of propagation of project variables in the MANIFEST.MF file
This commit is contained in:
parent
06866be44f
commit
738eab65cd
|
|
@ -36,11 +36,11 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Bundle-Version>${pv4osgi}</Bundle-Version>
|
<Bundle-Version>${project.version}</Bundle-Version>
|
||||||
<Bundle-Description>${project.description}</Bundle-Description>
|
<Bundle-Description>${project.description}</Bundle-Description>
|
||||||
<Implementation-Version>${project.version}</Implementation-Version>
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
|
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
|
||||||
3
pom.xml
3
pom.xml
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- <project_version_for_osgi>1.3.0</project_version_for_osgi> -->
|
<!-- <project_version_for_osgi>1.3.0</project_version_for_osgi> -->
|
||||||
<pv4osgi>1.3.1</pv4osgi>
|
<pv4osgi>1.4.3</pv4osgi>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
|
@ -72,6 +72,7 @@
|
||||||
<filtering>true</filtering>
|
<filtering>true</filtering>
|
||||||
</resource>
|
</resource>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
@ -45,11 +46,11 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Bundle-Version>${pv4osgi}</Bundle-Version>
|
<Bundle-Version>${project.version}</Bundle-Version>
|
||||||
<Bundle-Description>${project.description}</Bundle-Description>
|
<Bundle-Description>${project.description}</Bundle-Description>
|
||||||
<Implementation-Version>${project.version}</Implementation-Version>
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
|
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
|
|
|
||||||
|
|
@ -42,11 +42,11 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Bundle-Version>${pv4osgi}</Bundle-Version>
|
<Bundle-Version>${project.version}</Bundle-Version>
|
||||||
<Bundle-Description>${project.description}</Bundle-Description>
|
<Bundle-Description>${project.description}</Bundle-Description>
|
||||||
<Implementation-Version>${project.version}</Implementation-Version>
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
|
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
|
||||||
|
|
@ -48,11 +48,11 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Bundle-Version>${pv4osgi}</Bundle-Version>
|
<Bundle-Version>${project.version}</Bundle-Version>
|
||||||
<Bundle-Description>${project.description}</Bundle-Description>
|
<Bundle-Description>${project.description}</Bundle-Description>
|
||||||
<Implementation-Version>${project.version}</Implementation-Version>
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
|
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
|
||||||
|
|
@ -43,11 +43,11 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Bundle-Version>${pv4osgi}</Bundle-Version>
|
<Bundle-Version>${project.version}</Bundle-Version>
|
||||||
<Bundle-Description>${project.description}</Bundle-Description>
|
<Bundle-Description>${project.description}</Bundle-Description>
|
||||||
<Implementation-Version>${project.version}</Implementation-Version>
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
|
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
|
||||||
|
|
@ -38,11 +38,11 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Bundle-Version>${pv4osgi}</Bundle-Version>
|
<Bundle-Version>${project.version}</Bundle-Version>
|
||||||
<Bundle-Description>${project.description}</Bundle-Description>
|
<Bundle-Description>${project.description}</Bundle-Description>
|
||||||
<Implementation-Version>${project.version}</Implementation-Version>
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
|
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
|
||||||
|
|
@ -33,11 +33,11 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Bundle-Version>${pv4osgi}</Bundle-Version>
|
<Bundle-Version>${project.version}</Bundle-Version>
|
||||||
<Bundle-Description>${project.description}</Bundle-Description>
|
<Bundle-Description>${project.description}</Bundle-Description>
|
||||||
<Implementation-Version>${project.version}</Implementation-Version>
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
|
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue