[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-56-g4243de1
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 4243de1d6d18cc09e6f49d9d09b24a08b0aebd34 (commit) via 6c39e02178ad1064b541879c75864c8fa33261d2 (commit) from 2ba9cb8c56ec1dca0b323635cf2d3667dfdfe472 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=4243de1d6d18cc09e6f49d9d0... http://github.com/ceki/logback/commit/4243de1d6d18cc09e6f49d9d09b24a08b0aebd... commit 4243de1d6d18cc09e6f49d9d09b24a08b0aebd34 Author: Ceki Gulcu <ceki@qos.ch> Date: Thu Oct 27 10:21:15 2011 +0200 make site plugin work, editorial cleanup diff --git a/logback-site/pom.xml b/logback-site/pom.xml index 6593ca4..e5f5cac 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -39,18 +39,13 @@ <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. - --> + <!-- 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> - </build> - - <reporting> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -60,17 +55,8 @@ </outputDirectory> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> - </reporting> + + </build> </project> \ No newline at end of file diff --git a/logback-site/src/site/pages/repos.html b/logback-site/src/site/pages/repos.html index 7a1e2e2..3a11952 100644 --- a/logback-site/src/site/pages/repos.html +++ b/logback-site/src/site/pages/repos.html @@ -37,29 +37,12 @@ <h2>Web Access</h2> - <p>If you just wish to browse around or download a few individual - files, you can do so with your web-browser: + <p>If you just wish to browse the project history or inspect a few + individual files, you can do so with your web-browser: <a + href="http://github.com/ceki/logback/tree/master"> + http://github.com/ceki/logback/tree/master</a> </p> - <table cellspacing="6"> - - <tr> - <td>on github</td> - <td> - <a href="http://github.com/ceki/logback/tree/master"> - http://github.com/ceki/logback/tree/master</a> (slow but rich) - </td> - </tr> - - - <tr> - <td>on git.qos.ch</td> - <td><a href="http://git.qos.ch/gitweb/?p=logback.git;a=summary"> - http://git.qos.ch/gitweb/?p=logback.git;a=summary</a> (fast but minimal) - </td> - </tr> - </table> - <h2>Cloning</h2> @@ -93,12 +76,7 @@ <p>In principle, the repositories listed above have identical contents.</p> - - <h2>Subversion</h2> - - <p>Previously, we relied on Subversion as our version control - system. Git is considerably better.</p> - + <script src="templates/footer.js" type="text/javascript"></script> </div> </body> http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=6c39e02178ad1064b541879c7... http://github.com/ceki/logback/commit/6c39e02178ad1064b541879c75864c8fa33261... commit 6c39e02178ad1064b541879c75864c8fa33261d2 Author: Ceki Gulcu <ceki@qos.ch> Date: Thu Oct 27 09:54:59 2011 +0200 indentation changes only diff --git a/logback-access/pom.xml b/logback-access/pom.xml index 996d456..f875b36 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -1,6 +1,6 @@ <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"> <modelVersion>4.0.0</modelVersion> @@ -16,10 +16,10 @@ <url>http://logback.qos.ch</url> - <description> + <description> Logback: the reliable, generic, fast and flexible logging library for Java. </description> - + <licenses> <license> <name>Eclipse Public License - v 1.0</name> @@ -54,10 +54,10 @@ </dependency> <!--<dependency>--> - <!--<groupId>org.mortbay.jetty</groupId>--> - <!--<artifactId>jetty</artifactId>--> - <!--<scope>compile</scope>--> - <!--<optional>true</optional>--> + <!--<groupId>org.mortbay.jetty</groupId>--> + <!--<artifactId>jetty</artifactId>--> + <!--<scope>compile</scope>--> + <!--<optional>true</optional>--> <!--</dependency>--> @@ -69,10 +69,10 @@ </dependency> <!--<dependency>--> - <!--<groupId>org.mortbay.jetty</groupId>--> - <!--<artifactId>servlet-api-2.5</artifactId>--> - <!--<scope>compile</scope>--> - <!--<optional>true</optional>--> + <!--<groupId>org.mortbay.jetty</groupId>--> + <!--<artifactId>servlet-api-2.5</artifactId>--> + <!--<scope>compile</scope>--> + <!--<optional>true</optional>--> <!--</dependency>--> <dependency> @@ -124,10 +124,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF + </manifestFile> + </archive> </configuration> <executions> <execution> @@ -148,15 +149,16 @@ <execution> <id>bundle-manifest</id> <phase>process-classes</phase> - <goals> + <goals> <goal>manifest</goal> - </goals> + </goals> </execution> </executions> <configuration> <instructions> <Export-Package>ch.qos.logback.access.*</Export-Package> - <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> + <Bundle-RequiredExecutionEnvironment>J2SE-1.5 + </Bundle-RequiredExecutionEnvironment> </instructions> </configuration> </plugin> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 9d4ba41..e56646c 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -2,185 +2,187 @@ 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"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> - <artifactId>logback-core</artifactId> - <packaging>jar</packaging> - <name>Logback Core Module</name> + <artifactId>logback-core</artifactId> + <packaging>jar</packaging> + <name>Logback Core Module</name> - <url>http://logback.qos.ch</url> - <description> - <!-- - Never _never_ let Eclipse's auto format function add - a line return in the description. - The generated jar will contain a corrupt MANIFEST file. - --> - Logback: the generic, reliable, fast and flexible logging library for Java. - </description> + <url>http://logback.qos.ch</url> + <description> + <!-- + Never _never_ let Eclipse's auto format function add + a line return in the description. + The generated jar will contain a corrupt MANIFEST file. + --> + Logback: the generic, reliable, fast and flexible logging library for Java. + </description> - <licenses> - <license> - <name>Eclipse Public License - v 1.0</name> - <url>http://www.eclipse.org/legal/epl-v10.html</url> - </license> + <licenses> + <license> + <name>Eclipse Public License - v 1.0</name> + <url>http://www.eclipse.org/legal/epl-v10.html</url> + </license> - <license> - <name>GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url> - </license> - </licenses> + <license> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url> + </license> + </licenses> - <dependencies> - <dependency> - <groupId>janino</groupId> - <artifactId>janino</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> + <dependencies> + <dependency> + <groupId>janino</groupId> + <artifactId>janino</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.4</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.4</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <scope>test</scope> + </dependency> - </dependencies> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> - <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <configuration> - <testSourceDir>src/test/scala</testSourceDir> - </configuration> - <executions> - <execution> - <id>scala-test-compile</id> - <phase>process-test-resources</phase> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.scala-tools</groupId> + <artifactId>maven-scala-plugin</artifactId> + <configuration> + <testSourceDir>src/test/scala</testSourceDir> + </configuration> + <executions> + <execution> + <id>scala-test-compile</id> + <phase>process-test-resources</phase> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <reportFormat>plain</reportFormat> - <parallel>classes</parallel> - <trimStackTrace>false</trimStackTrace> - <excludes> - <exclude>**/All*Test.java</exclude> - <exclude>**/PackageTest.java</exclude> - <exclude>**/ConsoleAppenderTest.java</exclude> - <exclude>**/TimeBasedRollingTest.java</exclude> - </excludes> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>once</forkMode> + <reportFormat>plain</reportFormat> + <parallel>classes</parallel> + <trimStackTrace>false</trimStackTrace> + <excludes> + <exclude>**/All*Test.java</exclude> + <exclude>**/PackageTest.java</exclude> + <exclude>**/ConsoleAppenderTest.java</exclude> + <exclude>**/TimeBasedRollingTest.java</exclude> + </excludes> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <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-jar-plugin</artifactId> + <configuration> + <archive> + <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.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - <configuration> - <instructions> - <Export-Package>ch.qos.logback.core.*</Export-Package> - <Import-Package> - javax.*;resolution:=optional, - org.xml.*;resolution:=optional, - org.codehaus.janino;resolution:=optional, - * - </Import-Package> - <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + <configuration> + <instructions> + <Export-Package>ch.qos.logback.core.*</Export-Package> + <Import-Package> + javax.*;resolution:=optional, + org.xml.*;resolution:=optional, + org.codehaus.janino;resolution:=optional, + * + </Import-Package> + <Bundle-RequiredExecutionEnvironment>J2SE-1.5 + </Bundle-RequiredExecutionEnvironment> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index a4741af..1a18530 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -1,6 +1,6 @@ <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>ch.qos.logback</groupId> @@ -94,12 +94,12 @@ <tasks> <mkdir dir="lib/"/> <property name="slf4jJAR" - value="${settings.localRepository}/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar" /> + value="${settings.localRepository}/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"/> <echo>Copying ${slf4jJAR} to lib/</echo> <delete> - <fileset dir="lib/" includes="slf4j-*SNAPSHOT.jar" /> + <fileset dir="lib/" includes="slf4j-*SNAPSHOT.jar"/> </delete> - <copy file="${slf4jJAR}" todir="lib/" /> + <copy file="${slf4jJAR}" todir="lib/"/> </tasks> </configuration> <goals> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index 9646189..6593ca4 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -1,73 +1,76 @@ -<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"> +<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"> - <parent> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-site</artifactId> - <packaging>jar</packaging> - <name>Logback Site</name> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-site</artifactId> + <packaging>jar</packaging> + <name>Logback Site</name> - <url>http://logback.qos.ch</url> + <url>http://logback.qos.ch</url> - <organization> - <name>QOS.ch</name> - <url>http://www.qos.ch</url> - </organization> - <inceptionYear>1999</inceptionYear> + <organization> + <name>QOS.ch</name> + <url>http://www.qos.ch</url> + </organization> + <inceptionYear>1999</inceptionYear> <licenses> <license> <name>Eclipse Public License - v 1.0</name> <url>http://www.eclipse.org/legal/epl-v10.html</url> </license> - + <license> <name>GNU Lesser General Public License</name> <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url> </license> </licenses> - <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. - --> + <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> + <filtering>true</filtering> + </resource> + </resources> - </build> + </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <outputDirectory>${project.parent.basedir}/target/site</outputDirectory> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <outputDirectory>${project.parent.basedir}/target/site + </outputDirectory> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reportSets> + <reportSet> + <reports> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> </project> \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 40 ++-- logback-core/pom.xml | 322 ++++++++++++++++---------------- logback-examples/pom.xml | 10 +- logback-site/pom.xml | 91 ++++----- logback-site/src/site/pages/repos.html | 32 +--- 5 files changed, 233 insertions(+), 262 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.
participants (1)
-
git-noreply＠pixie.qos.ch