-->
<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">
+ 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>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.13.6-SNAPSHOT</version>
</parent>
<modules>
<properties>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.targer>1.8</maven.compiler.targer>
- <jacoco.skip>true</jacoco.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Maven plugin versions -->
- <mvn.assembly.version>2.1</mvn.assembly.version>
- <mvn.compiler.version>3.7.0</mvn.compiler.version>
<mvn.clean.version>2.5</mvn.clean.version>
<mvn.resource.version>3.1.0</mvn.resource.version>
<mvn.deploy.version>2.4</mvn.deploy.version>
- <mvn.hub.version>1.4.0</mvn.hub.version>
<mvn.install.version>2.4</mvn.install.version>
- <mvn.jar.version>2.4</mvn.jar.version>
- <mvn.jaxb2.version>0.13.3</mvn.jaxb2.version>
- <mvn.license.version>1.10</mvn.license.version>
- <mvn.shade.version>2.3</mvn.shade.version>
- <mvn.surefire.version>2.19.1</mvn.surefire.version>
- <maven.dependency.version>2.8</maven.dependency.version>
- <mvn.swagger.version>3.1.0</mvn.swagger.version>
- <mvn.war.version>2.1.1</mvn.war.version>
- <maven-core.version>3.5.3</maven-core.version>
- <maven-plugin-plugin.version>3.5.1</maven-plugin-plugin.version>
- <maven-plugin-annotations.version>3.5.1</maven-plugin-annotations.version>
- <mvn.antrun.version>1.8</mvn.antrun.version>
<!-- Onboarding 3rd party versions -->
- <aspectj.version>1.8.9</aspectj.version>
<aspectjrt.version>${aspectj.version}</aspectjrt.version>
<bsh.version>2.0b6</bsh.version>
<cglib.nodep.version>3.2.4</cglib.nodep.version>
<classmate.version>1.3.3</classmate.version>
- <commons.codec.version>1.10</commons.codec.version>
- <commons.collections.version>4.1</commons.collections.version>
+ <commons.codec.version>${commons-codec}</commons.codec.version>
<commons.digester.version>2.1</commons.digester.version>
- <commons.io.version>2.5</commons.io.version>
- <commons.lang.version>2.6</commons.lang.version>
- <commons.lang3.version>3.4</commons.lang3.version>
- <cxf.version>3.1.16</cxf.version>
- <datastax.cassandra.version>3.4.0</datastax.cassandra.version>
- <easymock.version>3.4</easymock.version>
- <groovy.version>2.4.8</groovy.version>
- <groovy.minimal.version>1.5.8</groovy.minimal.version>
- <gson.version>2.3.1</gson.version>
- <fop.version>2.2</fop.version>
- <freemarker.version>2.3.26-incubating</freemarker.version>
- <hibernate.validator.version>5.3.6.Final</hibernate.validator.version>
- <http.client.version>4.5.3</http.client.version>
- <http.core.version>4.4.1</http.core.version>
+ <commons.lang3.version>${lang3.version}</commons.lang3.version>
+ <datastax.cassandra.version>3.8.0</datastax.cassandra.version>
+ <http.client.version>${httpclient.version}</http.client.version>
+ <http.core.version>${httpcore.version}</http.core.version>
<httpasyncclient.version>4.1.2</httpasyncclient.version>
- <janino.version>2.7.7</janino.version>
- <jaxb.impl.version>2.2.11</jaxb.impl.version>
- <javax.el.version>2.2.4</javax.el.version>
- <javax.el-api.version>3.0.1-b04</javax.el-api.version>
+ <com.sun.xml.version>2.3.3</com.sun.xml.version>
+ <javax.el.version>2.2.6</javax.el.version>
+ <javax.el-api.version>3.0.1-b06</javax.el-api.version>
<javax.inject.version>1</javax.inject.version>
- <javax.servlet.version>2.5</javax.servlet.version>
- <jackson.version>2.9.9</jackson.version>
<jackson.annotations.version>${jackson.version}</jackson.annotations.version>
<jackson.dataformat.version>${jackson.version}</jackson.dataformat.version>
- <jackson.mapper.version>1.9.13</jackson.mapper.version>
<jcommander.version>1.58</jcommander.version>
- <jetty.servlets.version>9.4.11.v20180605</jetty.servlets.version>
<jersey.core.version>1.19.1</jersey.core.version>
<jersey.multipart.version>1.18.1</jersey.multipart.version>
- <junit.version>4.12</junit.version>
- <logback.version>1.2.3</logback.version>
- <mockito.all.version>1.10.19</mockito.all.version>
- <org.codehaus.jackson.version>1.9.13</org.codehaus.jackson.version>
<org.everit.json.schema.version>1.5.1</org.everit.json.schema.version>
- <org.reflections.version>0.9.10</org.reflections.version>
- <powermock.version>2.0.0-beta.5</powermock.version>
- <servlet.version>2.5</servlet.version>
- <slf4j.version>1.7.21</slf4j.version>
- <snakeyaml.version>1.17</snakeyaml.version>
- <spring.framework.version>4.3.18.RELEASE</spring.framework.version>
- <swagger.version>2.0.8</swagger.version>
- <testng.version>6.14.3</testng.version>
+ <slf4j.version>${slf4j-api.version}</slf4j.version>
+ <spring.framework.version>${spring.version}</spring.framework.version>
+ <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version>
<woodstox.version>4.4.1</woodstox.version>
- <ws.rs.version>2.0.1</ws.rs.version>
- <zusammen.version>1.0.1</zusammen.version>
+ <zusammen.version>1.0.2</zusammen.version>
<zusammen-state-store.version>1.0.2</zusammen-state-store.version>
<zusammen-collaboration-store.version>1.0.2</zusammen-collaboration-store.version>
<zusammen-index-store.version>1.0.0</zusammen-index-store.version>
+ <zusammen-common-utilities.version>1.0.3</zusammen-common-utilities.version>
<build.tools.version>${project.version}</build.tools.version>
- <togglz.version>2.4.1.Final</togglz.version>
- <bouncycastle.version>1.61</bouncycastle.version>
- <onap.logging.version>1.6.1</onap.logging.version>
</properties>
<dependencyManagement>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${spring.framework.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.framework.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.framework.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.3</version>
+ <version>${apache-commons-text.version}</version>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>${jaxb.impl.version}</version>
+ <version>${com.sun.xml.version}</version>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all-minimal</artifactId>
- <version>${groovy.minimal.version}</version>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<version>${aspectjrt.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>${datastax.cassandra.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.jnr</groupId>
+ <artifactId>jnr-posix</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<version>${datastax.cassandra.version}</version>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${ws.rs.version}</version>
</dependency>
<dependency>
<artifactId>wiremock</artifactId>
<version>${wire-mock.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>${junitJupiter.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <version>${mockitoJupiter.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito.all.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${mvn.jar.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${mvn.surefire.version}</version>
<configuration>
- <forkCount>${fork.count}</forkCount>
- <forkMode>${fork.mode}</forkMode>
<printSummary>false</printSummary>
<additionalClasspathElements>
- <additionalClasspathElement>${project.basedir}/src/test/resources</additionalClasspathElement>
+ <additionalClasspathElement>${project.basedir}/src/test/resources
+ </additionalClasspathElement>
</additionalClasspathElements>
<systemPropertyVariables>
- <logback.configurationFile>src/test/resources/logback-test.xml</logback.configurationFile>
+ <logback.configurationFile>src/test/resources/logback-test.xml
+ </logback.configurationFile>
<config.location>${project.basedir}/configuration</config.location>
</systemPropertyVariables>
- <useSystemClassLoader>${useSystemClassLoader}</useSystemClassLoader>
</configuration>
</plugin>
<plugin>
Code Review / sdc.git / blobdiff