<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.1</version>
+ <version>2.0.0</version>
<relativePath />
</parent>
<groupId>org.onap.so</groupId>
<module>cloudify-client</module>
<module>cxf-logging</module>
<module>so-monitoring</module>
+ <module>vnfm-simulator</module>
<module>packages</module>
</modules>
<properties>
<sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
<jacoco.version>0.7.5.201505241946</jacoco.version>
<org.apache.maven.user-settings />
- <!-- TODO: update to version 1.4.0 for Dublin -->
- <openstack.version>1.4.0-SNAPSHOT</openstack.version>
+ <openstack.version>1.5.0-SNAPSHOT</openstack.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
<originalClassifier>original</originalClassifier>
<docker.skip>true</docker.skip>
<siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
<cxf.version>3.2.6</cxf.version>
<jax.ws.rs>2.1</jax.ws.rs>
- <springboot.version>2.0.5.RELEASE</springboot.version>
+ <springboot.version>2.1.5.RELEASE</springboot.version>
<camunda.springboot.version>3.2.0</camunda.springboot.version>
<format.skipValidate>false</format.skipValidate>
<format.skipExecute>true</format.skipExecute>
+ <io.fabric8.version>4.1.0</io.fabric8.version>
</properties>
<distributionManagement>
<repository>
</resource>
</resources>
<plugins>
- <plugin>
+ <!-- <plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<stagingProfileId>176c31dfe190a</stagingProfileId>
<serverId>ecomp-staging</serverId>
</configuration>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8</version> <!-- This version supports the "deployAtEnd" parameter -->
+ <version>2.8</version>
+ <!-- This version supports the "deployAtEnd" parameter -->
<configuration>
<skip />
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<goals>
<goal>format</goal>
</goals>
+ <phase>process-sources</phase>
<configuration>
<skip>${format.skipExecute}</skip>
<configFile>${base-path}/project-configs/code-tools/onap-eclipse-format.xml</configFile>
<goals>
<goal>format</goal>
</goals>
+ <phase>process-sources</phase>
<configuration>
<skip>${format.skipExecute}</skip>
<sourceDirectory>${project.basedir}</sourceDirectory>
<configXmlFile>${base-path}/project-configs/code-tools/pom-format.properties</configXmlFile>
<includes>
- <include>${project.basedir}/pom.xml</include>
+ <include>pom.xml</include>
</includes>
</configuration>
</execution>
<configuration>
<skip>${format.skipValidate}</skip>
<configFile>${base-path}/project-configs/code-tools/pom-format.properties</configFile>
- <includes>
- <include>${project.basedir}/pom.xml</include>
+ <includes>
+ <include>pom.xml</include>
</includes>
</configuration>
</execution>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
- <version>3.5.33</version>
+ <version>${io.fabric8.version}</version>
<configuration>
<skip>${docker.skip}</skip>
<skipBuild>${docker.skip.build}</skipBuild>
<skipPush>${docker.skip.push}</skipPush>
- <dockerHost>${docker.newHost}</dockerHost> <!-- 1. Update address to your local docker VM. 2. Add IP to your NO_PROXY environment variable -->
- <certPath>${docker.host.cert.path}</certPath><!-- Add -Ddocker.host.cert.pat="path to your local certs directory"
- to maven build command -->
- <pushRegistry>${dockerPushRepo}</pushRegistry> <!-- Update .m2/settings.xml Add server id settings.dockerRepository, username, and password -->
- <pullRegistry>${dockerPullRepo}</pullRegistry> <!-- If docker repo is not public. Update .m2/settings.xml Add server id settings.dockerRepository, username, and password -->
+ <dockerHost>${docker.newHost}</dockerHost>
+ <!-- 1. Update address to your local docker VM. 2. Add IP to your NO_PROXY environment variable -->
+ <certPath>${docker.host.cert.path}</certPath>
+ <!-- Add -Ddocker.host.cert.pat="path to your local certs directory" to maven build command -->
+ <pushRegistry>${dockerPushRepo}</pushRegistry>
+ <!-- Update .m2/settings.xml Add server id settings.dockerRepository, username, and password -->
+ <pullRegistry>${dockerPullRepo}</pullRegistry>
+ <!-- If docker repo is not public. Update .m2/settings.xml Add server id settings.dockerRepository, username,
+ and password -->
<images>
<image>
<alias>service</alias>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.10</version>
+ <version>1.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
- <version>5.1.4</version>
+ <version>5.2.4</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20140107</version>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.19</version>
- </dependency>
</dependencies>
</dependencyManagement>
<profiles>