Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Joakim Erdfelt 2022-01-05 12:27:32 -06:00
parent 7fa552a57c 13956b27e2
commit 372c1d1d3f
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
6 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-home/pom.xml
View File

@ -130,7 +130,7 @@
<configuration>
<includeGroupIds>jakarta.transaction,org.eclipse.jetty</includeGroupIds>
<excludeGroupIds>
org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
org.eclipse.jetty.demo,org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
</excludeGroupIds>
<excludeArtifactIds>
apache-jsp,glassfish-jstl,jetty-start,jetty-slf4j-impl

0
jetty-home/src/main/resources/lib/ext/.donotdelete
View File

7
jetty-home/src/main/resources/modules/logging-log4j1.mod
View File

@ -4,8 +4,13 @@
Configures Jetty logging to use Log4j.
SLF4J is used as the core logging mechanism.
[deprecated]
Module 'logging-log4j1' is deprecated for removal.
Use 'logging-log4j2' instead.
[tags]
logging
deprecated
[depends]
logging/slf4j
@ -25,7 +30,7 @@ lib/logging/slf4j-log4j12-${slf4j.version}.jar
lib/logging/log4j-${log4j.version}.jar
[ini]
log4j.version?=@log4j.version@
log4j.version?=1.2.17
jetty.webapp.addServerClasses+=,org.apache.log4j.

14
jetty-home/src/main/resources/modules/logging-log4j2.mod
View File

@ -17,17 +17,17 @@ log4j
[files]
basehome:modules/logging/log4j2
maven://org.apache.logging.log4j/log4j-slf4j18-impl/${log4j.version}|lib/logging/log4j-slf4j18-impl-${log4j.version}.jar
maven://org.apache.logging.log4j/log4j-api/${log4j.version}|lib/logging/log4j-api-${log4j.version}.jar
maven://org.apache.logging.log4j/log4j-core/${log4j.version}|lib/logging/log4j-core-${log4j.version}.jar
maven://org.apache.logging.log4j/log4j-slf4j18-impl/${log4j2.version}|lib/logging/log4j-slf4j18-impl-${log4j2.version}.jar
maven://org.apache.logging.log4j/log4j-api/${log4j2.version}|lib/logging/log4j-api-${log4j2.version}.jar
maven://org.apache.logging.log4j/log4j-core/${log4j2.version}|lib/logging/log4j-core-${log4j2.version}.jar
[lib]
lib/logging/log4j-slf4j18-impl-${log4j.version}.jar
lib/logging/log4j-api-${log4j.version}.jar
lib/logging/log4j-core-${log4j.version}.jar
lib/logging/log4j-slf4j18-impl-${log4j2.version}.jar
lib/logging/log4j-api-${log4j2.version}.jar
lib/logging/log4j-core-${log4j2.version}.jar
[ini]
log4j.version?=@log4j2.version@
log4j2.version?=@log4j2.version@
jetty.webapp.addServerClasses+=,org.apache.logging.log4j.
[license]

2
jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod
View File

@ -13,10 +13,10 @@ Use 'unixdomain-http' instead (requires Java 16 or later).
[tags]
connector
deprecated
[depend]
unixsocket-http
deprecated
[xml]
etc/jetty-unixsocket-secure.xml

6
pom.xml
View File

@ -97,7 +97,6 @@
<jsp.impl.version>10.0.10</jsp.impl.version>
<junit.version>5.8.2</junit.version>
<kerb-simplekdc.version>2.0.1</kerb-simplekdc.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.17.1</log4j2.version>
<logback.version>1.3.0-alpha12</logback.version>
<mariadb.version>2.7.4</mariadb.version>
@ -1151,11 +1150,6 @@
<artifactId>jakarta.xml.ws-api</artifactId>
<version>${jakarta.xml.ws.api.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-jpms</artifactId>