natas_hw
/
slf4j
mirror of https://github.com/qos-ch/slf4j
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/weiglewilczek/slf4j into weiglewilczek-master

This commit is contained in:
Ceki Gulcu 2010-11-01 21:46:17 +01:00
parent b6e0c25112 7e9992fde3
commit 1cd601df7b
3 changed files with 41 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pom.xml
View File

@ -99,6 +99,25 @@
</resource>
</resources>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.1.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
<_versionpolicy>[$(@),$(version;=+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

23
slf4j-api/pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<packaging>jar</packaging>
<packaging>bundle</packaging>
<name>SLF4J API Module</name>
<url>http://www.slf4j.org</url>
@ -20,7 +20,7 @@
<dependencies>
</dependencies>
</dependencies>
<build>
<plugins>
@ -39,6 +39,21 @@
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>org.slf4j.*;version="${project.version}"</Export-Package>
<Import-Package>
!org.slf4j.impl.*,
*
</Import-Package>
</instructions>
</configuration>
</plugin>
<!-- That will be done by the Felix Bundle plugin (BND)! -->
<!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@ -61,7 +76,7 @@
</goals>
</execution>
</executions>
</plugin>
</plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -85,7 +100,7 @@
</plugins>
</build>
<reporting>
<plugins>
<plugin>

73
slf4j-scala-api/pom.xml
View File

@ -57,7 +57,7 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<plugins>
@ -102,90 +102,23 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.1.0</version>
<extensions>true</extensions>
<!--executions>
<execution>
<goals>
<goal>bundle</goal>
</goals>
</execution>
</executions-->
<configuration>
<instructions>
<!-- We need at least Java 5 for Scala 2.8! -->
<Bundle-RequiredExecutionEnvironment>J2SE-1.5,JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
<Export-Package>org.slf4j.scala.*;version="${project.version}"</Export-Package>
<Import-Package>
scala.*;version="[${scala.version},${scala.version}]",
*
</Import-Package>
<_versionpolicy>[$(@),$(version;=+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
<!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
<reportFormat>plain</reportFormat>
<trimStackTrace>false</trimStackTrace>
<excludes>
<exclude>**/AllTest.java</exclude>
<exclude>**/PackageTest.java</exclude>
</excludes>
</configuration>
</plugin-->
<!--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>
<executions>
<execution>
<id>bundle-test-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</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>
<configuration>
<tasks>
<echo>Removing slf4j-api's dummy StaticLoggerBinder and StaticMarkerBinder</echo>
<delete dir="target/classes/org/slf4j/impl"/>
</tasks>
</configuration>
</plugin-->
</plugins>
</build>
<reporting>
<plugins>
<plugin>