diff options
Diffstat (limited to 'aai-resources/pom.xml')
| -rw-r--r-- | aai-resources/pom.xml | 233 |
1 files changed, 92 insertions, 141 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index bc37acd..5cc366d 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -28,10 +28,10 @@ <parent> <groupId>org.onap.aai.resources</groupId> <artifactId>resources</artifactId> - <version>1.14.4-SNAPSHOT</version> + <version>1.15.1-SNAPSHOT</version> </parent> <properties> - <java.version>1.8</java.version> + <java.version>11</java.version> <start-class>org.onap.aai.ResourcesApp</start-class> <!-- Default docker registry that maven fabric plugin will try to pull from --> @@ -40,8 +40,6 @@ <!-- This value should be overwritten at runtime to wherever need to be pushed to --> <docker.push.registry>localhost:5000</docker.push.registry> <aai.docker.version>1.0.0</aai.docker.version> - <aai.base.image>alpine</aai.base.image> - <aai.base.image.version>1.13.4</aai.base.image.version> <netty.handler.version>4.1.63.Final</netty.handler.version> <netty.version>4.1.63.Final</netty.version> @@ -75,30 +73,33 @@ <schema.version.namespace.change.start>v12</schema.version.namespace.change.start> <schema.version.edge.label.start>v12</schema.version.edge.label.start> <schema.version.api.default>v29</schema.version.api.default> - <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29</schema.version.list> + <schema.version.list>v10,v11,v12,v13,v14,v15,v23,v29</schema.version.list> <schema.uri.base.path>/aai</schema.uri.base.path> <!-- <schema.translator.list>config</schema.translator.list> --> <schema.ingest.file>${project.basedir}/src/main/resources/application.properties</schema.ingest.file> <!-- End of Default ONAP Schema Properties --> - <spring.boot.version>2.4.13</spring.boot.version> - - <janusgraph.version>0.5.3</janusgraph.version> - <gremlin.version>3.4.13</gremlin.version> + <!-- <janusgraph.version>0.6.4</janusgraph.version> + <gremlin.version>3.5.8</gremlin.version> --> <javax.servlet.version>4.0.1</javax.servlet.version> <keycloak.version>11.0.2</keycloak.version> - <micrometer.version>1.6.6</micrometer.version> <testcontainers.version>1.6.1</testcontainers.version> <mockito.core.version>4.4.0</mockito.core.version> - <eclipse.persistence.version>2.6.2</eclipse.persistence.version> + <eclipse.persistence.version>2.7.7</eclipse.persistence.version> <!-- Setting some default value to not complain by editor but it will be overridden by gmaven plugin --> <!-- Integration tests will be skipped by default. Could be enabled here or by -DskipITs=false--> <skipITs>true</skipITs> <swagger.version>1.6.8</swagger.version> - <spring-cloud.version>2020.0.2</spring-cloud.version> + <spring-cloud.version>2020.0.6</spring-cloud.version> + <!-- fix the driver version to match the one defined in janusgraph-cql + spring-boot (2.4) is otherwise downgrading it to 4.9.0 --> + <!-- see https://github.com/spring-projects/spring-boot/blob/d336a96b7f204a398b8237560c5dfa7095c53460/spring-boot-project/spring-boot-dependencies/build.gradle#L163 --> + <!-- see https://github.com/JanusGraph/janusgraph/blob/6105d67f412def90ed6e704fa01cbf656602e6c9/pom.xml#L112 --> + <cassandra-driver.version>4.17.0</cassandra-driver.version> + <datastax.native-protocol.version>1.5.1</datastax.native-protocol.version> </properties> <profiles> <!-- Docker profile to be used for building docker image and pushing to nexus --> @@ -107,36 +108,15 @@ <build> <plugins> <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <phase>pre-clean</phase> - </execution> - <execution> - <id>parse-base</id> - <phase>prepare-package</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source> - def userAaiBaseImage = session.userProperties['aai.base.image'] - def userAaiCommonVersion = session.userProperties['aai.base.image.version'] - if (userAaiCommonVersion != null) { - project.properties['aai.base.image.version'] = userAaiCommonVersion - } - if (userAaiBaseImage != null) { - project.properties['aai.base.image'] = userAaiBaseImage - } - log.info 'Base image flavour: ' + project.properties['aai.base.image'] - log.info 'Base image version: ' + project.properties['aai.base.image.version'] - </source> - </configuration> - </execution> - </executions> - </plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <phase>pre-clean</phase> + </execution> + </executions> + </plugin> <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> @@ -206,7 +186,7 @@ <properties> <schema.source.name>onap</schema.source.name> <schema.version.namespace.change.start>v12</schema.version.namespace.change.start> - <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29</schema.version.list> + <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v23,v29</schema.version.list> <schema.ingest.file>${project.basedir}/src/main/resources/application.properties</schema.ingest.file> </properties> </profile> @@ -307,7 +287,22 @@ </dependency> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-hateoas</artifactId> + <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-jetty</artifactId> </dependency> <dependency> <groupId>org.springframework.cloud</groupId> @@ -318,25 +313,12 @@ <artifactId>spring-cloud-sleuth-zipkin</artifactId> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>io.micrometer</groupId> - <artifactId>micrometer-core</artifactId> - <version>${micrometer.version}</version> - </dependency> - <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-registry-prometheus</artifactId> - <version>${micrometer.version}</version> </dependency> <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-jersey2</artifactId> - <version>${micrometer.version}</version> </dependency> <dependency> <groupId>javax.jms</groupId> @@ -349,16 +331,12 @@ <version>2.1</version> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </dependency> <dependency> @@ -453,7 +431,8 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-junit</artifactId> + <artifactId>hamcrest</artifactId> + <version>2.2</version> <exclusions> <exclusion> <groupId>junit</groupId> @@ -497,10 +476,6 @@ <artifactId>freemarker</artifactId> </dependency> <dependency> - <groupId>org.onap.aaf.authz</groupId> - <artifactId>aaf-cadi-aaf</artifactId> - </dependency> - <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> </dependency> @@ -531,34 +506,15 @@ <groupId>com.jayway.jsonpath</groupId> <artifactId>json-path</artifactId> </dependency> - <!-- Do not use activemq-all because they force you to use a specific logging - and they shade it so you can't simply exclude it and when you deploy the - jar, you will notice failure --> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-broker</artifactId> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-client</artifactId> - </dependency> <dependency> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-core</artifactId> <exclusions> <exclusion> - <groupId>org.onap.aai.aai-common</groupId> - <artifactId>aai-aaf-auth</artifactId> - </exclusion> - <exclusion> <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> </exclusion> <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - </exclusion> - <exclusion> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> </exclusion> @@ -570,32 +526,11 @@ <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> </exclusions> </dependency> <dependency> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-schema-ingest</artifactId> - <exclusions> - <exclusion> - <groupId>org.onap.aai.aai-common</groupId> - <artifactId>aai-aaf-auth</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> - <exclusions> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - </exclusion> - </exclusions> </dependency> <!-- Do not use the jersey-client since jersey client 1.0 version clashes with jersey 2 which we are using --> @@ -605,6 +540,24 @@ <artifactId>httpclient</artifactId> </dependency> <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.21.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-junit</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> <groupId>org.skyscreamer</groupId> <artifactId>jsonassert</artifactId> <scope>test</scope> @@ -639,35 +592,11 @@ <version>${netty.handler.version}</version> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-tomcat</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-jetty</artifactId> - </dependency> - <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> <version>${netty.version}</version> </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - <classifier>indy</classifier> - <version>${groovy.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-test</artifactId> - <scope>test</scope> - </dependency> + <!-- Only used for the WebTestClient --> <dependency> <groupId>org.springframework.boot</groupId> @@ -724,6 +653,12 @@ <artifactId>testcontainers</artifactId> <version>1.19.8</version> <scope>test</scope> + <!-- <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> --> </dependency> <dependency> <groupId>org.testcontainers</groupId> @@ -738,9 +673,15 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.xmlunit</groupId> + <artifactId>xmlunit-matchers</artifactId> + <version>2.7.0</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - <version>1.18.30</version> + <version>1.18.34</version> <scope>provided</scope> </dependency> <dependency> @@ -769,13 +710,23 @@ <artifactId>guava</artifactId> <version>25.0-jre</version> </dependency> - <!-- https://docs.datastax.com/en/developer/java-driver/3.5/manual/metrics/index.html#metrics-4-compatibility --> - <!-- remove this for janusgraph >= 0.6.0 --> + <!-- cassandra driver --> + <dependency> + <groupId>com.datastax.oss</groupId> + <artifactId>java-driver-core</artifactId> + <version>${cassandra-driver.version}</version> + </dependency> + <dependency> + <groupId>com.datastax.oss</groupId> + <artifactId>java-driver-query-builder</artifactId> + <version>${cassandra-driver.version}</version> + </dependency> <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>3.2.6</version> + <groupId>com.datastax.oss</groupId> + <artifactId>native-protocol</artifactId> + <version>${datastax.native-protocol.version}</version> </dependency> + <!-- /cassandra driver --> </dependencies> </dependencyManagement> <build> |