This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 24d005f LOG4J2-3368 Bump Tomcat from 8.5.20 to 10.0.14 in
log4j-appserver along with some dependency clean-up. (#730)
24d005f is described below
commit 24d005fdc26e4103b9a1feaa538888c2a6c3137f
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Mon Jan 31 13:35:06 2022 +0100
LOG4J2-3368 Bump Tomcat from 8.5.20 to 10.0.14 in log4j-appserver along
with some dependency clean-up. (#730)
---
log4j-appserver/pom.xml | 71 +++++++++++--------------------------------------
src/changes/changes.xml | 3 +++
2 files changed, 19 insertions(+), 55 deletions(-)
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
index 242bc49..e835546 100644
--- a/log4j-appserver/pom.xml
+++ b/log4j-appserver/pom.xml
@@ -15,14 +15,15 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
<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/xsd/maven-4.0.0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-appserver</artifactId>
<packaging>jar</packaging>
@@ -33,8 +34,8 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Web Documentation</docLabel>
<projectDir>/log4j-appserver</projectDir>
- <tomcat.version>8.5.20</tomcat.version>
- <jetty.version>9.4.31.v20200723</jetty.version> <!-- Jetty 9 requires
Java 8 -->
+ <tomcat-juli.version>10.0.16</tomcat-juli.version>
+ <jetty.version>9.4.31.v20200723</jetty.version>
<module.name>org.apache.logging.log4j.appserver</module.name>
<maven.doap.skip>true</maven.doap.skip>
</properties>
@@ -45,34 +46,10 @@
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>${tomcat.version}</version>
+ <artifactId>tomcat-juli</artifactId>
+ <version>${tomcat-juli.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-annotations-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -80,31 +57,6 @@
<version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -123,8 +75,10 @@
</plugin>
</plugins>
</build>
+
<reporting>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
@@ -141,6 +95,7 @@
<useJql>true</useJql>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -154,6 +109,7 @@
<propertyExpansion>licensedir=${log4jParentDir}/checkstyle-header.txt</propertyExpansion>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -181,10 +137,12 @@
</reportSet>
</reportSets>
</plugin>
+
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
@@ -204,6 +162,7 @@
</reportSet>
</reportSets>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
@@ -212,6 +171,8 @@
<targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
</plugin>
+
</plugins>
</reporting>
+
</project>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 64a2b4e..209f264 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -313,6 +313,9 @@
Add Configurator.setLevel(Logger, Level) and setLevel(String, String).
</action>
<!-- UPDATE -->
+ <action issue="LOG4J2-3368" dev="vy" type="udpate">
+ Bump Tomcat from 8.5.20 to 10.0.14 in log4j-appserver along with some
dependency clean-up.
+ </action>
<action dev="ggregory" type="udpate" due-to="Dependabot">
Bump Mockito from 3.11.2 to 4.2.0.
</action>
