update logging versions #2461 (#2465)

* update logging versions #2461

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
Olivier Lamy 2018-04-19 15:45:11 +10:00 committed by GitHub
parent 6d0ff04dab
commit c7e78ae896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 19 deletions

View File

@ -100,7 +100,7 @@ To test a Jetty release, complete the following steps for each release you want
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty-version>7.6.2.v20120308</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<slf4j-version>1.6.4</slf4j-version>
<slf4j.version>1.6.4</slf4j.version>
<spring-version>3.1.0.RELEASE</spring-version>
</properties>
<repositories>

View File

@ -18,9 +18,6 @@
<osgi-version>3.6.0.v20100517</osgi-version>
<osgi-services-version>3.2.100.v20100503</osgi-services-version>
<equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>
<!--equinox-servletbridge-version>1.0.0-v20070523</equinox-servletbridge-version-->
<logback-version>0.9.29</logback-version>
<slf4j-version>1.6.1</slf4j-version>
</properties>
<modules>
@ -163,27 +160,27 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j-version}</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j-version}</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback-version}</version>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback-version}</version>
<version>${logback.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -396,7 +396,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>

View File

@ -142,7 +142,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j-version}</version>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>

View File

@ -1,7 +1,7 @@
DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[description]
Provides a Java Util Loggin binding to SLF4J logging.
Provides a Java Util Logging binding to SLF4J logging.
[tags]
logging

View File

@ -23,5 +23,5 @@ Log4j is released under the Apache 2.0 license.
http://www.apache.org/licenses/LICENSE-2.0.html
[ini]
log4j2.version?=2.6.1
log4j2.version?=2.9.1
jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/log4j2/

View File

@ -36,5 +36,5 @@ or (per the licensee's choosing) under
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
[ini]
logback.version?=1.1.7
logback.version?=1.2.3
jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/logback/

View File

@ -16,7 +16,7 @@ maven://org.slf4j/slf4j-api/${slf4j.version}|lib/slf4j/slf4j-api-${slf4j.version
lib/slf4j/slf4j-api-${slf4j.version}.jar
[ini]
slf4j.version?=1.7.21
slf4j.version?=1.7.25
jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/slf4j/
[license]

10
pom.xml
View File

@ -17,7 +17,9 @@
<jetty.url>http://www.eclipse.org/jetty</jetty.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build-support-version>1.4</build-support-version>
<slf4j-version>1.6.6</slf4j-version>
<slf4j.version>1.7.25</slf4j.version>
<log4j2.version>2.9.1</log4j2.version>
<logback.version>1.2.3</logback.version>
<jetty-test-policy-version>1.2</jetty-test-policy-version>
<alpn.api.version>1.1.3.v20160715</alpn.api.version>
<jsp.version>8.5.24.2</jsp.version>
@ -1005,17 +1007,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
<version>${slf4j-version}</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j-version}</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>