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

release 1.6.4, fix issues with site plugin

This commit is contained in:
Ceki Gulcu 2011-10-31 23:51:10 +01:00
parent f5865d3241
commit 38915dafe0
18 changed files with 130 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jcl-over-slf4j/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jul-to-slf4j/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
log4j-over-slf4j/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
osgi-over-slf4j/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

160
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
<packaging>pom</packaging>
<name>SLF4J</name>
@ -95,6 +95,14 @@
<build>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.0</version>
</extension>
</extensions>
<resources>
<resource>
<directory>src/main/resources</directory>
@ -149,51 +157,6 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
<configuration>
<aggregate>true</aggregate>
<excludePackageNames>org.slf4j.migrator:org.slf4j.migrator.*
</excludePackageNames>
<links>
<link>
http://java.sun.com/j2se/1.5.0/docs/api
</link>
</links>
<groups>
<group>
<title>SLF4J packages</title>
<packages>org.slf4j:org.slf4j.*</packages>
</group>
<group>
<title>SLF4J extensions</title>
<packages>
org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent
</packages>
</group>
<group>
<title>Jakarta Commons Logging packages</title>
<packages>org.apache.commons.*</packages>
</group>
<group>
<title>Apache log4j</title>
<packages>org.apache.log4j</packages>
</group>
<group>
<title>java.util.logging (JUL) to SLF4J bridge</title>
<packages>org.slf4j.bridge</packages>
</group>
</groups>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@ -216,12 +179,78 @@
<executions>
<execution>
<id>parse-version</id>
<goals> <goal>parse-version</goal>
<goals>
<goal>parse-version</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- ====== site plugin ===== -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
<configuration>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
<configuration>
<aggregate>true</aggregate>
<javadocDir>target/site/apidocs/</javadocDir>
<linkJavadoc>true</linkJavadoc>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
<configuration>
<aggregate>true</aggregate>
<excludePackageNames>org.slf4j.migrator:org.slf4j.migrator.*
</excludePackageNames>
<links>
<link>
http://java.sun.com/j2se/1.5.0/docs/api
</link>
</links>
<groups>
<group>
<title>SLF4J packages</title>
<packages>org.slf4j:org.slf4j.*</packages>
</group>
<group>
<title>SLF4J extensions</title>
<packages>
org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent
</packages>
</group>
<group>
<title>Jakarta Commons Logging packages</title>
<packages>org.apache.commons.*</packages>
</group>
<group>
<title>Apache log4j</title>
<packages>org.apache.log4j</packages>
</group>
<group>
<title>java.util.logging (JUL) to SLF4J bridge</title>
<packages>org.slf4j.bridge</packages>
</group>
</groups>
</configuration>
</plugin>
</reportPlugins>
</configuration>
</plugin>
</plugins>
</build>
@ -360,43 +389,6 @@
</pluginRepository>
</pluginRepositories>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>2.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.4</version>
<reportSets>
<reportSet>
<reports/>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
<configuration>
<aggregate>true</aggregate>
<javadocDir>target/site/apidocs/</javadocDir>
<linkJavadoc>true</linkJavadoc>
</configuration>
</plugin>
</plugins>
</reporting>
<scm>
<connection>scm:svn:http://svn.slf4j.org/repos/slf4j/trunk</connection>
<developerConnection>scm:svn:https://svn.slf4j.org/repos/slf4j/trunk

2
slf4j-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
slf4j-ext/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6
slf4j-ext/src/test/java/org/slf4j/dummyExt/package.html
View File

@ -1,4 +1,8 @@
<html>
<body>
Tests related to the org.slfj.ext package. However, location information code
required the caller class (XLogger) to have a different prefix than
the test class XLoggerTest. This is ensured by having the test class
placed in a different package.
placed in a different package.
</body>
</html>

2
slf4j-jcl/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
slf4j-jdk14/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
slf4j-log4j12/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
slf4j-migrator/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
slf4j-nop/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
slf4j-osgi-integration-test/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
slf4j-osgi-test-bundle/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
slf4j-simple/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

69
slf4j-site/pom.xml
View File

@ -1,43 +1,42 @@
<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/maven-v4_0_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.4</version>
</parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-site</artifactId>
<packaging>jar</packaging>
<name>SLF4J Site</name>
<modelVersion>4.0.0</modelVersion>
<url>http://www.slf4j.org</url>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-site</artifactId>
<packaging>jar</packaging>
<name>SLF4J Site</name>
<build>
<resources>
<resource>
<directory>src/site/pages</directory>
<!--
We're saving filtered html docs in a temporary folder
and telling the site plug in to get the docs there.
-->
<url>http://www.slf4j.org</url>
<build>
<resources>
<resource>
<directory>src/site/pages</directory>
<!--We're saving filtered html docs in a temporary folder-->
<!--and telling the site plug in to get the docs there.-->
<targetPath>../../../target/site</targetPath>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<outputDirectory>${project.parent.basedir}/target/site</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<outputDirectory>${project.parent.basedir}/target/site
</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
</project>