diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-07-02 10:00:57 +0200 |
|---|---|---|
| committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-07-04 11:55:05 +0200 |
| commit | 9e6101e4b225804fbe38f40ebd49516e5e10ecce (patch) | |
| tree | 53fda1055ad1ab26c2e98a0166aca860e8c8fc47 /aai-traversal/pom.xml | |
| parent | 589066bc5238e8d86fe893949d1a48cfdc16309b (diff) | |
Use eclipse-temurin:8-jre-alpine docker base image in aai-traversal
- replace aai-common base image with plain java 8 jre
- remove custom folders and users to simplify setup
- fix janino, guava and activemq vulnerabilities
- remove apache httpclient, jsonassert, aaf-cadi and spring-test dependencies
Issue-ID: AAI-3913
Change-Id: Icca637b5adb8e9a480912c4e2b7d9e83ee3e29ba
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'aai-traversal/pom.xml')
| -rw-r--r-- | aai-traversal/pom.xml | 74 |
1 files changed, 14 insertions, 60 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index 99e5c2d..b11021d 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>traversal</artifactId> - <version>1.14.3-SNAPSHOT</version> + <version>1.14.4-SNAPSHOT</version> </parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>aai-traversal</artifactId> @@ -102,12 +102,11 @@ <javax.servlet.version>4.0.1</javax.servlet.version> <antlr.version>4.9.3</antlr.version> <keycloak.version>11.0.2</keycloak.version> + <activemq.version>5.16.7</activemq.version> <micrometer.version>1.6.6</micrometer.version> <mockito.core.version>3.4.0</mockito.core.version> <testcontainers.version>1.6.1</testcontainers.version> - <netty.handler.version>4.1.63.Final</netty.handler.version> - <netty.version>4.1.63.Final</netty.version> <!-- End of Default ONAP Schema Properties --> <!-- Integration tests will be skipped by default. Could be enabled here or by -DskipITs=false--> @@ -450,10 +449,7 @@ <dependency> <groupId>org.codehaus.janino</groupId> <artifactId>janino</artifactId> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <version>3.1.12</version> </dependency> <dependency> <groupId>org.janusgraph</groupId> @@ -589,13 +585,6 @@ </exclusion> </exclusions> </dependency> - <!-- Do not use the jersey-client since jersey client 1.0 version clashes - with jersey 2 which we are using --> - <!-- Use this to make http requests instead of jersey 1.0 client --> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> <dependency> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-rest</artifactId> @@ -606,17 +595,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.skyscreamer</groupId> - <artifactId>jsonassert</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>com.vaadin.external.google</groupId> - <artifactId>android-json</artifactId> - </exclusion> - </exclusions> - </dependency> <!-- Explicitly stating the security spring framework and exclude the bouncy castle since that is somehow overwriting our p12 file decryption that's built into java security This will cause the password is incorrect This needs to @@ -633,11 +611,6 @@ </exclusions> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - <version>${netty.handler.version}</version> - </dependency> - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> <exclusions> @@ -672,38 +645,13 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> - </dependency> - <!-- TODO: Migrate tests to junit 5 and remove this dependency --> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> <exclusions> - <exclusion> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - </exclusion> + <exclusion> + <groupId>com.vaadin.external.google</groupId> + <artifactId>android-json</artifactId> + </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>org.onap.aaf.authz</groupId> - <artifactId>aaf-cadi-aaf</artifactId> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${netty.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-test</artifactId> - <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.antlr</groupId> <artifactId>antlr4-runtime</artifactId> @@ -761,6 +709,12 @@ <version>${keycloak.version}</version> <scope>test</scope> </dependency> + <!-- TODO: Migrate tests to junit 5 and remove this dependency --> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> |