diff options
Diffstat (limited to 'slf4j-api/pom.xml')
| -rwxr-xr-x | slf4j-api/pom.xml | 55 |
1 files changed, 24 insertions, 31 deletions
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 6d1f6ba7..e8460b21 100755 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -1,5 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -7,7 +7,8 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.7.13-SNAPSHOT</version> + <version>2.0.12</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>slf4j-api</artifactId> @@ -18,8 +19,9 @@ <url>http://www.slf4j.org</url> - <dependencies> - </dependencies> + <properties> + <module-name>org.slf4j</module-name> + </properties> <build> <plugins> @@ -40,22 +42,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestEntries> - <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> - <Bundle-Description>${project.description}</Bundle-Description> - <Implementation-Version>${project.version}</Implementation-Version> - </manifestEntries> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> + <version>${maven-jar-plugin.version}</version> <executions> <execution> <id>bundle-test-jar</id> <phase>package</phase> <goals> - <goal>jar</goal> <goal>test-jar</goal> </goals> </execution> @@ -63,21 +55,22 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> <configuration> - <tasks> - <echo>Removing slf4j-api's dummy StaticLoggerBinder and StaticMarkerBinder</echo> - <delete dir="target/classes/org/slf4j/impl"/> - </tasks> + <instructions> + <Import-Package>org.slf4j.spi;version="${range;[===,+);${version_cleanup;${project.version}}}"</Import-Package> + <!-- Export the client/user package of slf4j-api version 1 to make the slf4j-api bundle in version 2 usable for bundles that only import slf4j-1.x --> + <_exportcontents><![CDATA[ + *,\ + org.slf4j;version="${latest.1.version}",\ + org.slf4j.helpers;version="${latest.1.version}" + ]]></_exportcontents> + <Require-Capability><![CDATA[ + osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))", + osgi.serviceloader;filter:="(osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider)";osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider" + ]]></Require-Capability> + </instructions> </configuration> </plugin> @@ -85,4 +78,4 @@ </build> -</project>
\ No newline at end of file +</project> |