diff options
| author |   Nandkishor Patke <nandkishor-laxman.patke@t-systems.com> | 2025-01-03 12:46:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2025-01-03 12:46:45 +0000 |
| commit | 9a0c516ced4dccddb45a94189ef5183728082e6f (patch) | |
| tree | 31619388c66715c15e647449a5c7822db966058b | |
| parent | 275b3ea54640a1012579536b2b9312648b8fcb0f (diff) | |
| parent | 360ad7fd3dadf81426c71c3c86a071e99cb62171 (diff) | |
Merge "Use aai-common 1.15.4 in graphadmin"
| -rwxr-xr-x | pom.xml | 26 |
1 files changed, 4 insertions, 22 deletions
@@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.3</version> + <version>1.15.4</version> </parent> <groupId>org.onap.aai.graphadmin</groupId> <artifactId>aai-graphadmin</artifactId> @@ -55,7 +55,7 @@ <docker.push.registry>localhost:5000</docker.push.registry> <aai.docker.version>1.0.0</aai.docker.version> <aai.schema.service.version>1.12.7</aai.schema.service.version> - <aai.common.version>1.15.3</aai.common.version> + <aai.common.version>1.15.4</aai.common.version> <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/ </aai.build.directory> <aai.docker.namespace>onap</aai.docker.namespace> @@ -100,8 +100,8 @@ <!-- <micrometer.version>1.8.1</micrometer.version> --> <antlr.version>4.9.3</antlr.version> <jcommander.version>1.78</jcommander.version> - <gremlin.version>3.7.1</gremlin.version> - <janusgraph.version>1.0.0</janusgraph.version> + <!-- <gremlin.version>3.7.1</gremlin.version> + <janusgraph.version>1.0.0</janusgraph.version> --> <!-- fix the driver version to match the one defined in janusgraph-cql spring-boot (2.6) is otherwise downgrading it to 4.13.0 --> @@ -510,24 +510,6 @@ <artifactId>httpclient</artifactId> </dependency> <!-- Start of Spring Framework Dependencies --> - <!-- - 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 be added back if org.bouncy castle dependency - sneaks backs in and causing issues with the two way ssl - --> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-rsa</artifactId> - <exclusions> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> |