+<!--
+ ~ Copyright © 2016-2018 European Support Limited
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
<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">
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.6.4-SNAPSHOT</version>
</parent>
<modules>
- <module>../openecomp-be/tools/artifact-copy-plugin</module>
- <module>../openecomp-be/tools/compile-helper-plugin</module>
<module>../common</module>
<module>../openecomp-be</module>
- <module>../openecomp-be/tools/build-data-installer</module>
- <module>../openecomp-be/tools/snapshot-signature-plugin</module>
<module>../openecomp-ui</module>
</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>
<!-- Onboarding 3rd party versions -->
<aspectj.version>1.8.9</aspectj.version>
<aspectjrt.version>${aspectj.version}</aspectjrt.version>
- <bsh.version>2.0b5</bsh.version>
+ <bsh.version>2.0b6</bsh.version>
<cglib.nodep.version>3.2.4</cglib.nodep.version>
<classmate.version>1.3.3</classmate.version>
- <commons.beanutils.version>1.9.3</commons.beanutils.version>
<commons.codec.version>1.10</commons.codec.version>
<commons.collections.version>4.1</commons.collections.version>
<commons.digester.version>2.1</commons.digester.version>
<httpasyncclient.version>4.1.2</httpasyncclient.version>
<janino.version>2.7.7</janino.version>
<jaxb.impl.version>2.2.11</jaxb.impl.version>
- <java.source>1.8</java.source>
- <java.target>1.8</java.target>
<javax.el.version>2.2.4</javax.el.version>
<javax.el-api.version>3.0.1-b04</javax.el-api.version>
<javax.inject.version>1</javax.inject.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <jackson.version>2.8.10</jackson.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>
<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>1.5.3</swagger.version>
- <testng.version>6.9.10</testng.version>
+ <swagger.version>2.0.8</swagger.version>
+ <testng.version>6.14.3</testng.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-state-store.version>1.0.1</zusammen-state-store.version>
- <zusammen-collaboration-store.version>1.0.1</zusammen-collaboration-store.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>
<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>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.2</version>
+ <version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>${commons.beanutils.version}</version>
+ <version>${commons-beanutils}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<version>${commons.lang3.version}</version>
</dependency>
<dependency>
- <groupId>io.swagger</groupId>
+ <groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger.version}</version>
</dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${mvn.jar.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <phase>none</phase>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>${mvn.clean.version}</version>
- <configuration>
- <excludeDefaultDirectories>true</excludeDefaultDirectories>
- <filesets>
- <fileset>
- <directory>${project.build.directory}</directory>
- <excludes>
- <exclude>${classes}</exclude>
- <exclude>${testClasses}</exclude>
- <exclude>${mavenStatus}</exclude>
- <exclude>${customGeneratedSources}</exclude>
- <exclude>build-data/**</exclude>
- </excludes>
- </fileset>
- </filesets>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
</additionalClasspathElements>
<systemPropertyVariables>
<logback.configurationFile>src/test/resources/logback-test.xml</logback.configurationFile>
- <artifactgenerator.config>
- ${project.basedir}/src/test/resources/config/Artifact-Generator.properties
- </artifactgenerator.config>
<config.location>${project.basedir}/configuration</config.location>
</systemPropertyVariables>
<useSystemClassLoader>${useSystemClassLoader}</useSystemClassLoader>
- <skip>${skipTestRun}</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${mvn.install.version}</version>
- <configuration>
- <skip>${skipInstall}</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${mvn.resource.version}</version>
- <configuration>
- <skip>${skipResourceCollection}</skip>
- </configuration>
</plugin>
</plugins>
<testResources>
Code Review / sdc.git / blobdiff