diff options
| -rw-r--r-- | integration/pom.xml | 501 | ||||
| -rw-r--r-- | pom.xml | 4 |
2 files changed, 202 insertions, 303 deletions
diff --git a/integration/pom.xml b/integration/pom.xml index 059c56e9..458bb0c7 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -20,7 +20,6 @@ SPDX-License-Identifier: Apache-2.0 ============LICENSE_END========================================================= --> - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -32,52 +31,84 @@ <packaging>pom</packaging> <name>Policy Integration POM</name> <description>Policy Integration POM</description> - <properties> <java.version>11</java.version> <!-- Note Well: For RELEASE/SNAPSHOT always set to the project version --> <version.parent.resources>3.6.2-SNAPSHOT</version.parent.resources> - <version.logback>1.2.11</version.logback> + <jacoco.dataFile>${project.basedir}/../target/code-coverage/jacoco-ut.exec</jacoco.dataFile> + <repo.npm>https://nexus3.onap.org/repository/npm.public/npm/-/</repo.npm> + <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry> + <docker.push.registry>nexus3.onap.org:10003</docker.push.registry> + <!-- Dependency Versions --> + <version.aaf>2.1.21</version.aaf> + <version.assertj>3.23.1</version.assertj> + <version.awaitility>4.2.0</version.awaitility> + <version.bind-jaxb-api>2.3.1</version.bind-jaxb-api> + <version.ccsdk>1.4.0</version.ccsdk> + <version.commons-cli>1.5.0</version.commons-cli> + <version.commons-codec>1.15</version.commons-codec> + <version.commons-fileupload>1.4</version.commons-fileupload> + <version.commons-io>2.11.0</version.commons-io> + <version.commons-lang3>3.12.0</version.commons-lang3> + <version.commons-text>1.10.0</version.commons-text> + <version.cucumber>7.9.0</version.cucumber> <version.dmaap>1.1.12</version.dmaap> - <version.powermock>2.0.9</version.powermock> - <version.eclipselink>2.7.8</version.eclipselink> + <version.docker-java>3.2.14</version.docker-java> <version.drools>7.73.0.Final</version.drools> - <version.jersey>2.37</version.jersey> - <version.jackson>2.14.0-rc1</version.jackson> - <version.ccsdk>1.4.0</version.ccsdk> - <version.swagger>1.6.6</version.swagger> - <version.swagger.core.v3>2.2.7</version.swagger.core.v3> - <version.swagger.codegen.v3>3.0.36</version.swagger.codegen.v3> - <version.javax.bind>2.3.1</version.javax.bind> - <version.javax.json>1.1.4</version.javax.json> - <version.netty>4.1.84.Final</version.netty> - <version.springboot>2.5.14</version.springboot> + <version.eclipselink>2.7.8</version.eclipselink> + <version.google-re2j>1.7</version.google-re2j> + <version.gson>2.10</version.gson> + <version.h2>1.4.200</version.h2> <version.hibernate.core>5.4.31.Final</version.hibernate.core> - <version.eelf.core>1.0.0</version.eelf.core> - <version.camel>3.7.3</version.camel> - <version.tomcat>9.0.62</version.tomcat> - <version.mockserver>5.13.2</version.mockserver> - <version.immutable>2.8.8</version.immutable> - <version.springfox>3.0.0</version.springfox> - <version.springdoc>1.6.13</version.springdoc> + <version.httpcore>4.4.16</version.httpcore> + <version.immutables>2.9.2</version.immutables> + <version.io.micrometer>1.10.2</version.io.micrometer> + <version.io.prometheus>0.16.0</version.io.prometheus> + <version.jackson>2.14.1</version.jackson> <version.jakarta-api>2.0.2</version.jakarta-api> - <version.io.micrometer>1.7.3</version.io.micrometer> - <version.io.prometheus>0.11.0</version.io.prometheus> - <version.postgres>42.5.0</version.postgres> + <version.javax-json>1.1.4</version.javax-json> + <version.jboss-jaxrs-api>1.0.1-Final</version.jboss-jaxrs-api> + <version.jersey>2.37</version.jersey> + <version.jetty>9.4.48.v20220622</version.jetty> + <version.json-simple>1.1.1</version.json-simple> + <version.json>20220924</version.json> + <version.junit-vintage>5.9.1</version.junit-vintage> + <version.junit>4.13.2</version.junit> <version.kafka>3.3.1</version.kafka> - <jacoco.dataFile>${project.basedir}/../target/code-coverage/jacoco-ut.exec</jacoco.dataFile> - <repo.npm>https://nexus3.onap.org/repository/npm.public/npm/-/</repo.npm> - <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry> - <docker.push.registry>nexus3.onap.org:10003</docker.push.registry> + <version.log4j>2.17.1</version.log4j> + <version.logback>1.2.11</version.logback> + <version.lombok>1.18.24</version.lombok> + <version.mariadb>3.1.0</version.mariadb> + <version.medeia>1.1.1</version.medeia> + <version.mockito-all>1.10.19</version.mockito-all> + <version.mockito-core>3.7.7</version.mockito-core> + <version.mockserver>5.14.0</version.mockserver> + <version.netty>4.1.85.Final</version.netty> + <version.nsa-cambria>1.2.1-oss</version.nsa-cambria> + <version.nsa-sa-client>1.3.0-oss</version.nsa-sa-client> + <version.openpojo>0.9.1</version.openpojo> + <version.plexus>3.5.0</version.plexus> + <version.postgresql>42.5.1</version.postgresql> + <version.powermock>2.0.9</version.powermock> + <version.sdc>2.0.0</version.sdc> + <version.servlet>4.0.1</version.servlet> + <version.slf4j>1.7.30</version.slf4j> + <version.snakeyaml>1.33</version.snakeyaml> + <version.spring>5.3.22</version.spring> + <version.springboot>2.5.14</version.springboot> + <version.springdoc>1.6.13</version.springdoc> + <version.swagger.codegen.v3>3.0.36</version.swagger.codegen.v3> + <version.swagger.core.v3>2.2.7</version.swagger.core.v3> + <version.swagger>1.6.9</version.swagger> + <version.tomcat>9.0.62</version.tomcat> + <version.websocket>1.5.3</version.websocket> </properties> - <distributionManagement> <site> <id>ecomp-site</id> <url>dav:${onap.nexus.url}${sitePath}</url> </site> </distributionManagement> - <dependencyManagement> <dependencies> <dependency> @@ -85,224 +116,193 @@ <artifactId>policy-parent-resources</artifactId> <version>${version.parent.resources}</version> </dependency> - <dependency> <groupId>jakarta.validation</groupId> <artifactId>jakarta.validation-api</artifactId> <version>${version.jakarta-api}</version> </dependency> - <!-- Jackson - needed by glassfish jersey --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${version.jackson}</version> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${version.jackson}</version> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jaxb-annotations</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jsonSchema</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-parameter-names</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-scala_2.12</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-yaml</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-xml</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-csv</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jdk8</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-joda</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-base</artifactId> <version>${version.jackson}</version> </dependency> - <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> <version>${version.jackson}</version> </dependency> - <!-- Jersey --> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> <version>${version.jersey}</version> - <exclusions> - <exclusion> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-jaxb</artifactId> - </exclusion> - </exclusions> </dependency> - <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet-core</artifactId> <version>${version.jersey}</version> </dependency> - <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-jetty-http</artifactId> <version>${version.jersey}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - </exclusions> </dependency> - <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> <version>${version.jersey}</version> </dependency> - <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-common</artifactId> <version>${version.jersey}</version> </dependency> - <dependency> <groupId>org.glassfish.jersey.inject</groupId> <artifactId>jersey-hk2</artifactId> <version>${version.jersey}</version> </dependency> - <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-grizzly2-http</artifactId> <version>${version.jersey}</version> </dependency> - <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-moxy</artifactId> <version>${version.jersey}</version> </dependency> - <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> <version>${version.jersey}</version> </dependency> - <dependency> <groupId>org.glassfish.jersey.test-framework</groupId> <artifactId>jersey-test-framework-core</artifactId> <version>${version.jersey}</version> </dependency> - <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> <artifactId>jersey-test-framework-provider-grizzly2</artifactId> <version>${version.jersey}</version> </dependency> - <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> <version>${version.jersey}</version> </dependency> - + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.json</artifactId> + <version>${version.javax-json}</version> + </dependency> + <!-- Jetty --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${version.jetty}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${version.jetty}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${version.jetty}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${version.jetty}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>${version.jetty}</version> + </dependency> <!-- RE2J in lieu of java.util Pattern --> <dependency> <groupId>com.google.re2j</groupId> <artifactId>re2j</artifactId> - <version>1.5</version> + <version>${version.google-re2j}</version> </dependency> - <!-- MariaDB --> <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>3.1.0</version> + <version>${version.mariadb}</version> </dependency> - <!-- Postgres --> <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>${version.postgres}</version> + <version>${version.postgresql}</version> </dependency> - <!-- Kafka --> <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> <version>${version.kafka}</version> - <exclusions> - <!-- The default Zookeeper version in Kafka has vulnerabilities --> - <exclusion> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </exclusion> - </exclusions> </dependency> - <!-- Prometheus Client Libraries --> <dependency> <groupId>io.prometheus</groupId> @@ -324,24 +324,12 @@ <artifactId>simpleclient_logback</artifactId> <version>${version.io.prometheus}</version> </dependency> - <!-- Swagger Jersey2 JAXRS --> <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-jersey2-jaxrs</artifactId> <version>${version.swagger}</version> - <exclusions> - <exclusion> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - </exclusion> - <exclusion> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </exclusion> - </exclusions> </dependency> - <!-- Swagger Models --> <dependency> <groupId>io.swagger</groupId> @@ -353,82 +341,82 @@ <artifactId>swagger-models</artifactId> <version>${version.swagger.core.v3}</version> </dependency> - <!-- Encoder and decoders for various formats --> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.15</version> + <version>${version.commons-codec}</version> </dependency> - - <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.4.17</version> - </dependency> - - <!-- Eclipse JPA API --> + <!-- Eclipselink --> <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>org.eclipse.persistence.jpa</artifactId> <version>${version.eclipselink}</version> </dependency> - - <!-- EclipseLink API --> <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> <version>${version.eclipselink}</version> </dependency> - + <dependency> + <groupId>org.eclipse.persistence</groupId> + <artifactId>org.eclipse.persistence.core</artifactId> + <version>${version.eclipselink}</version> + </dependency> + <dependency> + <groupId>org.eclipse.persistence</groupId> + <artifactId>org.eclipse.persistence.oracle</artifactId> + <version>${version.eclipselink}</version> + </dependency> <!-- Java Servlet API --> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>4.0.1</version> + <version>${version.servlet}</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${version.bind-jaxb-api}</version> </dependency> - <!-- HttpComponents Core (blocking I/O) --> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.14</version> + <version>${version.httpcore}</version> </dependency> - <!-- JSON marshalling and unmarshalling --> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.9.0</version> + <version>${version.gson}</version> </dependency> <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20201115</version> + <version>${version.json}</version> </dependency> <dependency> <groupId>com.worldturner.medeia</groupId> <artifactId>medeia-validator-gson</artifactId> - <version>1.1.1</version> + <version>${version.medeia}</version> </dependency> - <!-- Lombok --> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - <version>1.18.16</version> + <version>${version.lombok}</version> </dependency> - <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.30</version> + <version>${version.slf4j}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-ext</artifactId> - <version>1.7.30</version> + <version>${version.slf4j}</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> @@ -440,7 +428,16 @@ <artifactId>logback-classic</artifactId> <version>${version.logback}</version> </dependency> - + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${version.log4j}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + <version>${version.log4j}</version> + </dependency> <!-- Dmaap Client --> <dependency> <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> @@ -461,7 +458,6 @@ </exclusion> </exclusions> </dependency> - <!-- CDS dependencies --> <dependency> <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> @@ -482,27 +478,11 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>net.minidev</groupId> - <artifactId>json-smart</artifactId> - <version>2.4.7</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>2.17.1</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - <version>2.17.1</version> - </dependency> - <!-- AAF Client --> <dependency> <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-cadi-aaf</artifactId> - <version>2.1.21</version> + <version>${version.aaf}</version> <exclusions> <exclusion> <groupId>log4j</groupId> @@ -510,73 +490,62 @@ </exclusion> </exclusions> </dependency> - <!-- Client library for Cambria event routing API --> <dependency> <groupId>com.att.nsa</groupId> <artifactId>cambriaClient</artifactId> - <version>1.2.1-oss</version> + <version>${version.nsa-cambria}</version> </dependency> <dependency> <groupId>com.att.nsa</groupId> <artifactId>saClientLibrary</artifactId> - <version>1.3.0-oss</version> + <version>${version.nsa-sa-client}</version> </dependency> - <!-- Commons CLI for command line parsing --> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.4</version> + <version>${version.commons-cli}</version> </dependency> - <!-- Web Sockets --> <dependency> <groupId>org.java-websocket</groupId> <artifactId>Java-WebSocket</artifactId> - <version>1.5.1</version> + <version>${version.websocket}</version> </dependency> - <!-- SnakeYAML --> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.33</version> + <version>${version.snakeyaml}</version> </dependency> - <!-- Drools --> - <!-- Security Issues: 1 of 2 This dependency is trying to upgrade security fixes identified. If it is removed or manipulated then please fix the 2nd change as noted below. --> - <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.3.0</version> + <version>${version.plexus}</version> </dependency> - <dependency> <groupId>org.kie</groupId> <artifactId>kie-api</artifactId> <version>${version.drools}</version> </dependency> - <dependency> <groupId>org.kie</groupId> <artifactId>kie-ci</artifactId> <version>${version.drools}</version> - <!-- Issue: 2 of 2 Excluding these 2 dependencies in order to force upgrade security fixes identified. As declared above. Any changes here should be reflected above and vice versa. --> - <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> @@ -584,49 +553,36 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> <version>${version.drools}</version> </dependency> - <dependency> <groupId>org.drools</groupId> <artifactId>drools-persistence-jpa</artifactId> <version>${version.drools}</version> </dependency> - <dependency> <groupId>org.drools</groupId> <artifactId>drools-compiler</artifactId> <version>${version.drools}</version> </dependency> - <dependency> <groupId>org.drools</groupId> <artifactId>drools-verifier-drl</artifactId> <version>${version.drools}</version> </dependency> - <dependency> <groupId>org.drools</groupId> <artifactId>drools-verifier-api</artifactId> <version>${version.drools}</version> </dependency> - <dependency> <groupId>org.drools</groupId> <artifactId>drools-verifier-core</artifactId> <version>${version.drools}</version> </dependency> - - <dependency> - <groupId>org.dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>2.1.3</version> - </dependency> - <!-- Mockserver --> <dependency> <groupId>org.mock-server</groupId> @@ -634,173 +590,104 @@ <version>${version.mockserver}</version> <scope>test</scope> </dependency> - <dependency> <groupId>org.mock-server</groupId> <artifactId>mockserver-client-java</artifactId> <version>${version.mockserver}</version> <scope>test</scope> </dependency> - <!-- Immutables --> <dependency> <groupId>org.immutables</groupId> <artifactId>value</artifactId> - <version>${version.immutable}</version> + <version>${version.immutables}</version> <scope>provided</scope> </dependency> - <dependency> <groupId>org.immutables</groupId> <artifactId>gson</artifactId> - <version>${version.immutable}</version> + <version>${version.immutables}</version> </dependency> - - <!-- Springfox --> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger2</artifactId> - <version>${version.springfox}</version> - </dependency> - - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger-ui</artifactId> - <version>${version.springfox}</version> - <scope>runtime</scope> - </dependency> - <!-- Springdoc --> <dependency> <groupId>org.springdoc</groupId> <artifactId>springdoc-openapi-ui</artifactId> <version>${version.springdoc}</version> </dependency> - <!-- File upload --> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.4</version> + <version>${version.commons-fileupload}</version> </dependency> - - <!-- Janino --> - <dependency> - <groupId>org.codehaus.janino</groupId> - <artifactId>janino</artifactId> - <version>3.0.8</version> - </dependency> - - <!-- jaxws --> - <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.3.1</version> - </dependency> - <dependency> <groupId>org.onap.sdc.sdc-distribution-client</groupId> <artifactId>sdc-distribution-client</artifactId> - <version>2.0.0</version> + <version>${version.sdc}</version> </dependency> - <dependency> <groupId>org.onap.sdc.sdc-tosca</groupId> <artifactId>sdc-tosca</artifactId> - <version>1.5.1</version> + <version>${version.sdc}</version> </dependency> - <dependency> <groupId>org.jboss.spec.javax.ws.rs</groupId> <artifactId>jboss-jaxrs-api_2.0_spec</artifactId> - <version>1.0.1.Final</version> + <version>${version.jboss-jaxrs-api}</version> </dependency> - - <!-- transaction api --> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - </dependency> - - <!-- Dependencies dragged in by CDS --> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>3.21.7</version> - </dependency> - - <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-daemon-client</artifactId> - <version>1.7.20</version> - </dependency> - - <dependency> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-scripting-jvm</artifactId> - <version>1.7.20</version> - </dependency> - <!-- Test dependencies --> - <!-- In memory Database Engine --> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.200</version> + <version>${version.h2}</version> <scope>test</scope> </dependency> - <!-- JUNIT --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.13.1</version> + <version>${version.junit}</version> <scope>test</scope> </dependency> - <!-- Junit vintage --> <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> - <version>5.7.1</version> + <version>${version.junit-vintage}</version> <scope>test</scope> </dependency> - <!-- Cucumber Tests --> <dependency> <groupId>io.cucumber</groupId> <artifactId>cucumber-java</artifactId> - <version>6.9.1</version> + <version>${version.cucumber}</version> <scope>test</scope> </dependency> <dependency> <groupId>io.cucumber</groupId> <artifactId>cucumber-junit</artifactId> - <version>6.9.1</version> + <version>${version.cucumber}</version> <scope>test</scope> </dependency> - <!-- Exception testing --> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.18.1</version> + <version>${version.assertj}</version> <scope>test</scope> </dependency> - <!-- Mock libraries --> <dependency> <groupId>com.openpojo</groupId> <artifactId>openpojo</artifactId> - <version>0.8.13</version> + <version>${version.openpojo}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>1.10.19</version> + <version>${version.mockito-all}</version> <scope>test</scope> </dependency> <dependency> @@ -824,18 +711,16 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>3.7.7</version> + <version>${version.mockito-core}</version> <scope>test</scope> </dependency> - <!-- Awaitility --> <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> - <version>4.0.3</version> + <version>${version.awaitility}</version> <scope>test</scope> </dependency> - <!-- Netty --> <dependency> <groupId>io.netty</groupId> @@ -857,48 +742,77 @@ <artifactId>netty-handler-proxy</artifactId> <version>${version.netty}</version> </dependency> - <!-- Apache Commons --> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.12.0</version> + <version>${version.commons-lang3}</version> </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.8.0</version> + <version>${version.commons-io}</version> </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.10.0</version> + <version>${version.commons-text}</version> </dependency> - <!-- Google Code --> <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> - <version>1.1.1</version> + <version>${version.json-simple}</version> </dependency> - <!-- Github --> <dependency> <groupId>com.github.docker-java</groupId> <artifactId>docker-java-core</artifactId> - <version>3.2.7</version> + <version>${version.docker-java}</version> <scope>test</scope> </dependency> - <dependency> <groupId>com.github.docker-java</groupId> <artifactId>docker-java</artifactId> - <version>3.2.7</version> + <version>${version.docker-java}</version> <scope>test</scope> </dependency> - + <!-- Spring --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webflux</artifactId> + <version>${version.spring}</version> + </dependency> <!-- Springboot --> <dependency> <groupId>org.springframework.boot</groupId> @@ -951,30 +865,21 @@ <artifactId>spring-boot-autoconfigure</artifactId> <version>${version.springboot}</version> </dependency> - <!-- Hibernate --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${version.hibernate.core}</version> </dependency> - - <!-- Github --> - <dependency> - <groupId>io.github.classgraph</groupId> - <artifactId>classgraph</artifactId> - <version>4.8.146</version> - </dependency> - <!-- Tomcat --> <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-annotations-api</artifactId> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> <version>${version.tomcat}</version> </dependency> <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-core</artifactId> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-annotations-api</artifactId> <version>${version.tomcat}</version> </dependency> <dependency> @@ -987,18 +892,14 @@ <artifactId>tomcat-embed-websocket</artifactId> <version>${version.tomcat}</version> </dependency> - </dependencies> - </dependencyManagement> - <scm> <connection>scm:git:ssh://git.onap.org:29418/${project.groupId}</connection> <developerConnection>scm:git:ssh://git.onap.org:29418/${project.groupId}</developerConnection> <tag>HEAD</tag> <url>https://wiki.onap.org/display/DW/Integration+Project</url> </scm> - <profiles> <profile> <id>m2e</id> @@ -1146,7 +1047,6 @@ </build> </profile> </profiles> - <build> <extensions> <extension> @@ -1290,7 +1190,6 @@ </plugin> </plugins> </pluginManagement> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -25,7 +25,7 @@ <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> <!-- When changing, also change the oparent.version property --> - <version>3.3.2</version> + <version>3.3.3-SNAPSHOT</version> <relativePath /> </parent> <groupId>org.onap.policy.parent</groupId> @@ -34,7 +34,7 @@ <packaging>pom</packaging> <properties> - <oparent.version>3.3.2</oparent.version> + <oparent.version>3.3.3-SNAPSHOT</oparent.version> </properties> <modules> |