This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new d32c5690dc Upgrading Elasticsearch, Swagger UI and maven-gpg-plugin
d32c5690dc is described below
commit d32c5690dc94e2f02342d5720c29563f6e8c716b
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Wed Mar 27 08:43:25 2024 +0100
Upgrading Elasticsearch, Swagger UI and maven-gpg-plugin
---
core/starter/pom.xml | 5 -----
fit/build-tools/pom.xml | 5 -----
pom.xml | 32 ++++++++++++++++++++------------
sra/pom.xml | 5 -----
4 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/core/starter/pom.xml b/core/starter/pom.xml
index 6e40f0f062..e6cd8b8c39 100644
--- a/core/starter/pom.xml
+++ b/core/starter/pom.xml
@@ -95,11 +95,6 @@ under the License.
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index 0f6d53a331..1c2d93d2e6 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -201,11 +201,6 @@ under the License.
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 8ee9167514..36843aaf4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -430,8 +430,7 @@ under the License.
<slf4j.version>1.7.36</slf4j.version>
- <elasticsearch.version>8.12.2</elasticsearch.version>
- <elasticsearch-rest.version>8.10.4</elasticsearch-rest.version>
+ <elasticsearch.version>8.13.0</elasticsearch.version>
<opensearch.version>2.12.0</opensearch.version>
<opensearch-java.version>2.9.1</opensearch-java.version>
@@ -441,7 +440,6 @@ under the License.
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons-jexl.version>3.3</commons-jexl.version>
<commons-text.version>1.11.0</commons-text.version>
- <commons-logging.version>1.2</commons-logging.version>
<pac4j.version>5.5.0</pac4j.version>
@@ -452,7 +450,7 @@ under the License.
<h2.version>2.2.224</h2.version>
<swagger-core.version>2.2.21</swagger-core.version>
- <swagger-ui.version>5.12.0</swagger-ui.version>
+ <swagger-ui.version>5.12.2</swagger-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
@@ -637,7 +635,7 @@ under the License.
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
- <version>${elasticsearch-rest.version}</version>
+ <version>${elasticsearch.version}</version>
</dependency>
<dependency>
<groupId>co.elastic.clients</groupId>
@@ -953,6 +951,12 @@ under the License.
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl3</artifactId>
<version>${commons-jexl.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -1058,6 +1062,10 @@ under the License.
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1251,12 +1259,6 @@ under the License.
<artifactId>disruptor</artifactId>
<version>${disruptor.version}</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
@@ -1272,6 +1274,12 @@ under the License.
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>3.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2161,7 +2169,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
<executions>
<execution>
<id>sign-artifacts</id>
diff --git a/sra/pom.xml b/sra/pom.xml
index 995c460e4f..3f62d6073f 100644
--- a/sra/pom.xml
+++ b/sra/pom.xml
@@ -131,11 +131,6 @@ under the License.
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
