You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/03/31 07:09:58 UTC
[syncope] branch master updated: Upgrading SLF4j and Guava versions
(and aligning with CAS)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 1a38a80 Upgrading SLF4j and Guava versions (and aligning with CAS)
1a38a80 is described below
commit 1a38a8056423faf8b59f5cbe6fe8359e28b039c3
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Mar 31 09:09:45 2020 +0200
Upgrading SLF4j and Guava versions (and aligning with CAS)
---
.../main/resources/archetype-resources/wa/pom.xml | 2 --
client/idrepo/console/pom.xml | 2 +-
client/idrepo/enduser/pom.xml | 2 +-
core/starter/pom.xml | 2 +-
docker/wa/pom.xml | 2 --
fit/build-tools/pom.xml | 2 +-
fit/wa-reference/pom.xml | 2 --
pom.xml | 31 +++++++++++++++++-----
sra/pom.xml | 2 +-
wa/pom.xml | 2 --
10 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/archetype/src/main/resources/archetype-resources/wa/pom.xml b/archetype/src/main/resources/archetype-resources/wa/pom.xml
index 79489fb..538ae17 100644
--- a/archetype/src/main/resources/archetype-resources/wa/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/wa/pom.xml
@@ -33,10 +33,8 @@ under the License.
<packaging>war</packaging>
<properties>
- <guava.version>28.2-jre</guava.version>
<opensaml.version>3.4.5</opensaml.version>
<bootstrap.version>4.4.1</bootstrap.version>
- <slf4j.version>2.0.0-alpha1</slf4j.version>
</properties>
<dependencies>
diff --git a/client/idrepo/console/pom.xml b/client/idrepo/console/pom.xml
index e8447fd..c3e0e99 100644
--- a/client/idrepo/console/pom.xml
+++ b/client/idrepo/console/pom.xml
@@ -121,7 +121,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j18-impl</artifactId>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
diff --git a/client/idrepo/enduser/pom.xml b/client/idrepo/enduser/pom.xml
index c80e81e..a0d83df 100644
--- a/client/idrepo/enduser/pom.xml
+++ b/client/idrepo/enduser/pom.xml
@@ -104,7 +104,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j18-impl</artifactId>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
diff --git a/core/starter/pom.xml b/core/starter/pom.xml
index ad2baf5..cb5ed6e 100644
--- a/core/starter/pom.xml
+++ b/core/starter/pom.xml
@@ -83,7 +83,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j18-impl</artifactId>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
diff --git a/docker/wa/pom.xml b/docker/wa/pom.xml
index 62b1cdd..c85a2ee 100644
--- a/docker/wa/pom.xml
+++ b/docker/wa/pom.xml
@@ -34,10 +34,8 @@ under the License.
<packaging>war</packaging>
<properties>
- <guava.version>28.2-jre</guava.version>
<opensaml.version>3.4.5</opensaml.version>
<bootstrap.version>4.4.1</bootstrap.version>
- <slf4j.version>2.0.0-alpha1</slf4j.version>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
</properties>
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index fe10e45..fd11238 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -197,7 +197,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j18-impl</artifactId>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
diff --git a/fit/wa-reference/pom.xml b/fit/wa-reference/pom.xml
index c0adcd2..e9973a5 100644
--- a/fit/wa-reference/pom.xml
+++ b/fit/wa-reference/pom.xml
@@ -34,10 +34,8 @@ under the License.
<packaging>war</packaging>
<properties>
- <guava.version>28.2-jre</guava.version>
<opensaml.version>3.4.5</opensaml.version>
<bootstrap.version>4.4.1</bootstrap.version>
- <slf4j.version>2.0.0-alpha1</slf4j.version>
<ianal.skip>true</ianal.skip>
diff --git a/pom.xml b/pom.xml
index 25f0d1d..863e48b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -429,7 +429,7 @@ under the License.
<camel.version>3.1.0</camel.version>
- <slf4j.version>1.7.30</slf4j.version>
+ <slf4j.version>2.0.0-alpha1</slf4j.version>
<opensaml.version>3.3.1</opensaml.version>
<elasticsearch.version>7.6.1</elasticsearch.version>
@@ -456,7 +456,7 @@ under the License.
<swagger-core.version>2.1.1</swagger-core.version>
<swagger-ui.version>3.25.0</swagger-ui.version>
- <guava.version>20.0</guava.version>
+ <guava.version>28.2-jre</guava.version>
<jquery.version>3.4.1</jquery.version>
<jquery-ui.version>1.12.1</jquery-ui.version>
@@ -1027,6 +1027,28 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ <version>${spring-boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
<version>${cxf.version}</version>
@@ -1692,11 +1714,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j18-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
diff --git a/sra/pom.xml b/sra/pom.xml
index 6644b0e..b98503d 100644
--- a/sra/pom.xml
+++ b/sra/pom.xml
@@ -98,7 +98,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j18-impl</artifactId>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
diff --git a/wa/pom.xml b/wa/pom.xml
index eaaf61e..474e323 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -33,10 +33,8 @@ under the License.
<packaging>pom</packaging>
<properties>
- <guava.version>28.2-jre</guava.version>
<opensaml.version>3.4.5</opensaml.version>
<bootstrap.version>4.4.1</bootstrap.version>
- <slf4j.version>2.0.0-alpha1</slf4j.version>
<rootpom.basedir>${basedir}/..</rootpom.basedir>
</properties>