diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2025-01-02 11:25:51 +0100 |
|---|---|---|
| committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2025-01-02 11:25:51 +0100 |
| commit | 3e54e422de177ededb361aaec4c4f1e716914b2f (patch) | |
| tree | 8566870a7eb396e221b5f426424db5ef05ac7c42 | |
| parent | 21c9f6fe9f344bde654d6e167f2200ecb00007de (diff) | |
Upgrade slf4j in aai-common
- upgrade slf4j (1.7.25->1.7.36)
- add all slf4j dependencies to dependencyManagement
Issue-ID: AAI-4092
Change-Id: I57f970253ccd200646048c41463769bafe07911e
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
| -rw-r--r-- | aai-core/pom.xml | 6 | ||||
| -rw-r--r-- | aai-parent/pom.xml | 22 | ||||
| -rw-r--r-- | aai-schema-ingest/pom.xml | 12 | ||||
| -rw-r--r-- | pom.xml | 5 |
4 files changed, 21 insertions, 24 deletions
diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 26e5bc9a..9ffae3c4 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -366,12 +366,6 @@ limitations under the License. <artifactId>jackson-dataformat-yaml</artifactId> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - <type>pom</type> - </dependency> - <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> <scope>provided</scope> diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml index 865a8a7c..f56e132a 100644 --- a/aai-parent/pom.xml +++ b/aai-parent/pom.xml @@ -93,8 +93,7 @@ limitations under the License. <httpclient.version>4.5.13</httpclient.version> <io.swagger.version>1.5.24</io.swagger.version> <logback.version>1.2.13</logback.version> - <slf4j.version>1.7.25</slf4j.version> - <log4j.version>2.17.1</log4j.version> + <slf4j.version>1.7.36</slf4j.version> <mockito.all.version>3.4.0</mockito.all.version> <mockito.core.version>3.4.0</mockito.core.version> <opencsv.version>3.1</opencsv.version> @@ -211,6 +210,18 @@ limitations under the License. </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + <version>${slf4j.version}</version> + </dependency> + + <dependency> <groupId>org.hamcrest</groupId> <artifactId>java-hamcrest</artifactId> <version>${hamcrest.junit.version}</version> @@ -430,13 +441,6 @@ limitations under the License. </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - <type>pom</type> - </dependency> - - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons.io.version}</version> diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index 23404b20..43c3c64a 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -33,10 +33,6 @@ limitations under the License. <name>aai-schema-ingest</name> <packaging>jar</packaging> - <properties> - <httpclient.version>4.5.13</httpclient.version> - <springframework.version>4.3.24.RELEASE</springframework.version> - </properties> <build> <plugins> <plugin> @@ -117,6 +113,14 @@ limitations under the License. <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> @@ -226,11 +226,6 @@ <!-- Start of ONAP Specific Repositories --> <repositories> <repository> - <id>Log4j</id> - <name>Log4J repository</name> - <url>https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j</url> - </repository> - <repository> <id>AJSC</id> <name>AJSC repository</name> <url>https://mvnrepository.com/artifact/com.att.ajsc</url> |