[logback-dev] [GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-33-g13b0c1d
added by portage for gitosis-gentoo
git-noreply at pixie.qos.ch
Tue Oct 18 22:15:45 CEST 2011
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 13b0c1d6ab019a69bd9d833ed98e1e8e47e58d21 (commit)
from 30b71451468825c5b8fa9b5e7f46038680424a7f (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=13b0c1d6ab019a69bd9d833ed98e1e8e47e58d21
http://github.com/ceki/logback/commit/13b0c1d6ab019a69bd9d833ed98e1e8e47e58d21
commit 13b0c1d6ab019a69bd9d833ed98e1e8e47e58d21
Author: Ceki Gulcu <ceki at qos.ch>
Date: Tue Oct 18 22:15:35 2011 +0200
maven 3 compliance
diff --git a/logback-access/pom.xml b/logback-access/pom.xml
index 804b17c..996d456 100644
--- a/logback-access/pom.xml
+++ b/logback-access/pom.xml
@@ -108,15 +108,6 @@
<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.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<fork>once</fork>
diff --git a/logback-classic/osgi-build.xml b/logback-classic/osgi-build.xml
index f3586d0..2730e29 100644
--- a/logback-classic/osgi-build.xml
+++ b/logback-classic/osgi-build.xml
@@ -17,7 +17,8 @@
to true. See also http://jira.qos.ch/browse/LBCLASSIC-191 -->
<echo message="compile classpath: ${currentVersion}" />
- <echo message="test classpath: ${test_classpath}" />
+ <echo message="slfj4: ${org.slf4j:slf4j-api:jar}" />
+ <echo message="felix ${org.apache.felix:org.apache.felix.main:jar}" />
@@ -33,11 +34,6 @@
<pathelement location="${org.apache.felix:org.apache.felix.main:jar}" />
<pathelement location="target/classes/" />
<pathelement location="target/test-classes" />
- <!--
- <pathelement location="${org.slf4j:slf4j-api:jar}" />
- <pathelement location="../logback-core/target/classes/" />
- <pathelement location="../logback-core/target/test-classes/" />
- -->
</path >
diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
index 5301435..4a70dd9 100644
--- a/logback-classic/pom.xml
+++ b/logback-classic/pom.xml
@@ -308,7 +308,7 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="currentVersion" value="${version}" />
+ <property name="currentVersion" value="${project.version}" />
<property name="slf4j.version" value="${slf4j.version}"/>
<property name="basedir" value="${basedir}"/>
<ant antfile="${basedir}/osgi-build.xml"/>
@@ -338,7 +338,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<!-- once, never, -->
<forkMode>once</forkMode>
diff --git a/logback-core/pom.xml b/logback-core/pom.xml
index 7f83fda..5e64c4d 100644
--- a/logback-core/pom.xml
+++ b/logback-core/pom.xml
@@ -100,19 +100,8 @@
</plugin>
<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>
- <!--<version>2.14.3</version>-->
<configuration>
<testSourceDir>src/test/scala</testSourceDir>
</configuration>
@@ -131,7 +120,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
<forkMode>once</forkMode>
<reportFormat>plain</reportFormat>
diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml
index a9a9b81..a4741af 100644
--- a/logback-examples/pom.xml
+++ b/logback-examples/pom.xml
@@ -12,7 +12,6 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-examples</artifactId>
- <version>${parent.version}</version>
<packaging>jar</packaging>
<name>Logback Examples Module</name>
diff --git a/logback-site/pom.xml b/logback-site/pom.xml
index 59e6c35..9646189 100644
--- a/logback-site/pom.xml
+++ b/logback-site/pom.xml
@@ -11,7 +11,6 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-site</artifactId>
<packaging>jar</packaging>
- <version>${parent.version}</version>
<name>Logback Site</name>
<url>http://logback.qos.ch</url>
@@ -60,9 +59,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>
- maven-project-info-reports-plugin
- </artifactId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
diff --git a/pom.xml b/pom.xml
index a98e3eb..d846a12 100755
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
</modules>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- slf4j.version property is used below, in
logback-classic/pom.xml and in setClasspath.cmd -->
<slf4j.version>1.6.2</slf4j.version>
@@ -35,7 +36,6 @@
<janino.version>2.5.10</janino.version>
<scala.version>2.9.1</scala.version>
<groovy.version>1.7.6</groovy.version>
- <surefire.version>2.6</surefire.version>
<consolePlugin.version>1.1.0</consolePlugin.version>
<tomcat.version>7.0.21</tomcat.version>
<jetty.version>7.5.1.v20110908</jetty.version>
@@ -176,18 +176,11 @@
<build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>1.0-beta-1</version>
- </extension>
- </extensions>
-
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
<id>add-test-source</id>
@@ -215,6 +208,12 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
@@ -228,7 +227,14 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
@@ -258,6 +264,7 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.1</version>
<configuration>
@@ -273,7 +280,22 @@
<outputDirectory>target/site/dist/</outputDirectory>
</configuration>
</plugin>
-
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <!-- avoid "Duplicate entry" warnings -->
+ <version>2.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>2.15.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
</plugins>
</build>
@@ -282,7 +304,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
+ <version>3.0</version>
<configuration>
<excludeModules>fml</excludeModules>
<excludeModules>apt</excludeModules>
@@ -302,6 +324,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
<reportSets>
<reportSet>
<reports></reports>
@@ -312,6 +335,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
<configuration>
<aggregate>true</aggregate>
<!--<linksource>true</linksource>-->
-----------------------------------------------------------------------
Summary of changes:
logback-access/pom.xml | 9 -------
logback-classic/osgi-build.xml | 8 +-----
logback-classic/pom.xml | 3 +-
logback-core/pom.xml | 12 ----------
logback-examples/pom.xml | 1 -
logback-site/pom.xml | 5 +---
pom.xml | 46 ++++++++++++++++++++++++++++++---------
7 files changed, 39 insertions(+), 45 deletions(-)
hooks/post-receive
--
Logback: the generic, reliable, fast and flexible logging framework.
More information about the logback-dev
mailing list