inherit from a parent maven module. -->
<groupId>org.onap.vid</groupId>
<artifactId>vid-app-common</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>VID Common</name>
<description>VID Common code for opensource version</description>
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.3</version>
+ <version>2.0.0</version>
<relativePath/>
</parent>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<epsdk.version>2.4.0</epsdk.version>
- <springframework.version>4.3.22.RELEASE</springframework.version>
+ <springframework.version>5.1.6.RELEASE</springframework.version>
+ <springframework.orm.version>4.3.22.RELEASE</springframework.orm.version>
+ <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5:
+ org.springframework.orm.hibernate4.HibernateTransactionManager
+ so following orm.version lets epsdk-core find it -->
<hibernate.version>4.3.11.Final</hibernate.version>
<jackson.version>2.9.8</jackson.version>
- <jersey.version>2.27</jersey.version>
+ <jersey.version>2.28</jersey.version>
<surefire.version>2.22.1</surefire.version>
<sonar.coverage.exclusions>**/webapp/**/*,**/*.js</sonar.coverage.exclusions>
<!-- Skip assembling the zip by default -->
<skipassembly>true</skipassembly>
<nexusproxy>https://nexus.onap.org</nexusproxy>
- <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
- <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
- <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>
+ <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+ <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+ <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
+ <sitePath>content/sites/site/org/onap/vid/${project.version}</sitePath>
<aspectj.version>1.8.9</aspectj.version>
<kotlin.version>1.3.11</kotlin.version>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
<eirslett.version>1.6</eirslett.version>
- <node.version>v6.16.0</node.version>
+ <node.version>v8.9.4</node.version>
+ <npm.version>5.6.0</npm.version>
+ <!-- override using -Drelease_version=foo -Dpatch_version=bar -->
+ <release_version>${env.RELEASE_VERSION}</release_version>
+ <patch_version/>
</properties>
<repository>
<id>ecomp-releases</id>
<name>VID Release Repository</name>
- <url>${nexusproxy}${releaseNexusPath}</url>
+ <url>${nexusproxy}/${releaseNexusPath}</url>
</repository>
<repository>
<id>ecomp-snapshots</id>
<name>VID Snapshot Repository</name>
- <url>${nexusproxy}${snapshotNexusPath}</url>
+ <url>${nexusproxy}/${snapshotNexusPath}</url>
</repository>
<repository>
<id>ecomp-staging</id>
<name>VID Staging Repository</name>
- <url>${nexusproxy}${stagingNexusPath}</url>
+ <url>${nexusproxy}/${stagingNexusPath}</url>
</repository>
<repository>
<!-- Snapshots repository has ECOMP snapshot artifacts -->
<!-- added for javadoc -->
<site>
<id>ecomp-site</id>
- <url>dav:${nexusproxy}${sitePath}</url>
+ <url>dav:${nexusproxy}/${sitePath}</url>
</site>
</distributionManagement>
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
- </plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</goals>
<phase>generate-resources</phase>
<configuration>
+ <npmVersion>${npm.version}</npmVersion>
<nodeVersion>${node.version}</nodeVersion>
</configuration>
</execution>
+ <execution>
+ <id>npm config list</id>
+ <configuration>
+ <arguments>config ls -l</arguments>
+ </configuration>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ </execution>
+ <execution>
+ <id>npm install</id>
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ </execution>
<execution>
<id>npm run-script build</id>
<configuration>
</plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <version>1.5.3</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <regex>false</regex>
+ <file>${project.basedir}/src/main/webapp/app/vid/scripts/constants/version.json</file>
+ <replacements>
+ <replacement>
+ <token>BUILD_NUMBER</token>
+ <value>${release_version}.${patch_version}.${env.BUILD_NUMBER}</value>
+ </replacement>
+ </replacements>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>${springframework.version}</version>
+ <version>${springframework.orm.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<dependency>
<groupId>org.onap.sdc.sdc-tosca</groupId>
<artifactId>sdc-tosca</artifactId>
- <version>1.4.7</version>
+ <version>1.5.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.10.0</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Code Review / vid.git / blobdiff