Updated Branches: refs/heads/trunk 2ff729a63 -> a595f34e2
bumped log4j-2 from beta2 to beta9 Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/a595f34e Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/a595f34e Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/a595f34e Branch: refs/heads/trunk Commit: a595f34e245ad09dd745c5619906c52e3ce783e4 Parents: 2ff729a Author: jvermillard <[email protected]> Authored: Tue Oct 29 11:29:08 2013 +0100 Committer: jvermillard <[email protected]> Committed: Tue Oct 29 11:29:08 2013 +0100 ---------------------------------------------------------------------- coap/pom.xml | 6 ----- codec/pom.xml | 5 ---- core/pom.xml | 5 ---- examples/pom.xml | 70 +++++++++++++++++++++++++-------------------------- pom.xml | 13 +++++++--- protobuf/pom.xml | 6 ----- thrift/pom.xml | 6 ----- 7 files changed, 45 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/a595f34e/coap/pom.xml ---------------------------------------------------------------------- diff --git a/coap/pom.xml b/coap/pom.xml index fffec94..bd11ec9 100644 --- a/coap/pom.xml +++ b/coap/pom.xml @@ -47,11 +47,5 @@ <groupId>${project.groupId}</groupId> <artifactId>mina-codec</artifactId> </dependency> - - <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> - <artifactId>slf4j-impl</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/mina/blob/a595f34e/codec/pom.xml ---------------------------------------------------------------------- diff --git a/codec/pom.xml b/codec/pom.xml index ebd492a..0db53e3 100644 --- a/codec/pom.xml +++ b/codec/pom.xml @@ -37,11 +37,6 @@ <dependencies> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> - <artifactId>slf4j-impl</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/mina/blob/a595f34e/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index e3bb1c3..d5c7435 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -56,11 +56,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> - <artifactId>slf4j-impl</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/mina/blob/a595f34e/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 836b71f..226f31f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -20,47 +20,47 @@ --> <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";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.mina</groupId> - <artifactId>mina-parent</artifactId> - <version>3.0.0-M3-SNAPSHOT</version> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mina</groupId> + <artifactId>mina-parent</artifactId> + <version>3.0.0-M3-SNAPSHOT</version> + </parent> - <artifactId>mina-examples</artifactId> - <name>Apache MINA examples ${project.version}</name> - <packaging>jar</packaging> - <description>Apache MINA server and client examples</description> + <artifactId>mina-examples</artifactId> + <name>Apache MINA examples ${project.version}</name> + <packaging>jar</packaging> + <description>Apache MINA server and client examples</description> - <properties> - <symbolicName>${project.groupId}.examples</symbolicName> - <exportedPackage>${project.groupId}</exportedPackage> - </properties> + <properties> + <symbolicName>${project.groupId}.examples</symbolicName> + <exportedPackage>${project.groupId}</exportedPackage> + </properties> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>mina-core</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>mina-core</artifactId> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>mina-http</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>mina-http</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>mina-coap</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>mina-coap</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> - <artifactId>slf4j-impl</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> + </dependency> - </dependencies> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/mina/blob/a595f34e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ad01a41..5bdaefd 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ <properties> <!-- Dependencies versions ========================================== --> <version.junit>4.11</version.junit> - <version.log4j>2.0-beta2</version.log4j> + <version.log4j>2.0-beta9</version.log4j> <version.mockito-core>1.9.5</version.mockito-core> <version.slf4j.api>1.7.5</version.slf4j.api> @@ -179,8 +179,8 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> - <artifactId>slf4j-impl</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <version>${version.log4j}</version> <scope>test</scope> </dependency> @@ -205,6 +205,13 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${version.log4j}</version> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/mina/blob/a595f34e/protobuf/pom.xml ---------------------------------------------------------------------- diff --git a/protobuf/pom.xml b/protobuf/pom.xml index 95bfd64..5ed0781 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -44,12 +44,6 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> - <artifactId>slf4j-impl</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>${project.groupId}</groupId> <artifactId>mina-codec</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/mina/blob/a595f34e/thrift/pom.xml ---------------------------------------------------------------------- diff --git a/thrift/pom.xml b/thrift/pom.xml index c174f6e..2b5ece1 100644 --- a/thrift/pom.xml +++ b/thrift/pom.xml @@ -45,12 +45,6 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> - <artifactId>slf4j-impl</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>${project.groupId}</groupId> <artifactId>mina-codec</artifactId> </dependency>
