Upgrade to Spring Boot 2.5.7 and Log4j 2.15.0.

This commit is contained in:
Greg L. Turnquist
2021-12-13 10:15:49 -06:00
parent f7121c2bf8
commit 2787bf67da
14 changed files with 40 additions and 56 deletions

View File

@@ -19,7 +19,8 @@
<properties>
<java.version>1.8</java.version>
<axis.version>1.4</axis.version>
<log4j.version>1.2.16</log4j.version>
<log4j2.version>2.15.0</log4j2.version>
<sourcesDir>${project.basedir}/target/generated-sources/axis</sourcesDir>
<classesDir>${project.basedir}/target/classes</classesDir>
<wsdl>${project.basedir}/../airline.wsdl</wsdl>
@@ -39,13 +40,6 @@
<version>${axis.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>

View File

@@ -19,7 +19,7 @@
<properties>
<java.version>1.8</java.version>
<jax-ws.version>2.1.7</jax-ws.version>
<log4j.version>1.2.16</log4j.version>
<log4j2.version>2.15.0</log4j2.version>
<spring-ws.version>2.1.4.RELEASE</spring-ws.version>
<sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
<classesDir>${project.basedir}/target/classes</classesDir>
@@ -34,13 +34,6 @@
<version>${spring-ws.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>

View File

@@ -20,7 +20,7 @@
<activemq.version>4.1.2</activemq.version>
<java.version>1.8</java.version>
<jms.version>1.1</jms.version>
<log4j.version>1.2.16</log4j.version>
<log4j2.version>2.15.0</log4j2.version>
<sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
<classesDir>${project.basedir}/target/classes</classesDir>
<wsdl>${project.basedir}/../airline.wsdl</wsdl>
@@ -44,13 +44,6 @@
<version>${jms.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>

View File

@@ -18,6 +18,7 @@
<properties>
<java.version>1.8</java.version>
<log4j2.version>2.15.0</log4j2.version>
<xws.version>3.0</xws.version>
</properties>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
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>
@@ -19,7 +19,7 @@
<properties>
<java.version>1.8</java.version>
<jax-ws.version>2.1.7</jax-ws.version>
<log4j.version>1.2.16</log4j.version>
<log4j2.version>2.15.0</log4j2.version>
<xmlbeans.version>2.4.0</xmlbeans.version>
<xws.version>3.0</xws.version>
<sourcesDir>${project.basedir}/target/generated-sources/xjc</sourcesDir>
@@ -67,13 +67,6 @@
</exclusions>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-test</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.5.7</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -19,7 +19,7 @@
<properties>
<java.version>1.8</java.version>
<joda-time.version>2.10.6</joda-time.version>
<log4j.version>1.2.16</log4j.version>
<log4j2.version>2.15.0</log4j2.version>
<sourcesDir>${project.basedir}/target/generated-sources/axis</sourcesDir>
<classesDir>${project.basedir}/target/classes</classesDir>
<wsdl>${project.basedir}/../airline.wsdl</wsdl>
@@ -141,13 +141,6 @@
<version>${joda-time.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>log4j</groupId>-->
<!-- <artifactId>log4j</artifactId>-->
<!-- <version>${log4j.version}</version>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>

View File

@@ -17,6 +17,7 @@
<properties>
<java.version>1.8</java.version>
<log4j2.version>2.15.0</log4j2.version>
</properties>
<dependencies>
@@ -32,6 +33,11 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</dependency>
</dependencies>
<build>

View File

@@ -18,6 +18,7 @@
<properties>
<java.version>1.8</java.version>
<log4j2.version>2.15.0</log4j2.version>
</properties>
<dependencies>
@@ -33,6 +34,11 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</dependency>
</dependencies>
<build>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.5.7</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -19,7 +19,7 @@
<properties>
<java.version>1.8</java.version>
<joda-time.version>2.10.6</joda-time.version>
<log4j.version>1.2.16</log4j.version>
<log4j2.version>2.15.0</log4j2.version>
<sourcesDir>${project.basedir}/target/generated-sources/axis</sourcesDir>
<classesDir>${project.basedir}/target/classes</classesDir>
<wsdl>${project.basedir}/../airline.wsdl</wsdl>

View File

@@ -18,6 +18,7 @@
<properties>
<java.version>1.8</java.version>
<log4j2.version>2.15.0</log4j2.version>
</properties>
<dependencies>
@@ -33,6 +34,11 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</dependency>
</dependencies>
<build>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.5.7</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -19,7 +19,7 @@
<properties>
<java.version>1.8</java.version>
<joda-time.version>2.10.6</joda-time.version>
<log4j.version>1.2.16</log4j.version>
<log4j2.version>2.15.0</log4j2.version>
<xmlschema.version>2.0.2</xmlschema.version>
</properties>

14
pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.5.7</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -69,15 +69,13 @@
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.5.7</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -21,7 +21,7 @@
<jaxen.version>1.1.4</jaxen.version>
<jdom.version>2.0.1</jdom.version>
<joda-time.version>2.10.6</joda-time.version>
<log4j.version>1.2.16</log4j.version>
<log4j2.version>2.15.0</log4j2.version>
<sourcesDir>${project.basedir}/target/generated-sources/axis</sourcesDir>
<classesDir>${project.basedir}/target/classes</classesDir>
<wsdl>${project.basedir}/../airline.wsdl</wsdl>

View File

@@ -18,6 +18,7 @@
<properties>
<java.version>1.8</java.version>
<log4j2.version>2.15.0</log4j2.version>
<sourcesDir>${project.basedir}/target/generated-sources/xjc</sourcesDir>
<classesDir>${project.basedir}/target/classes</classesDir>
<schema>${project.basedir}/../../server/src/main/resources</schema>