From c487945a4d2dd9843fb3de4a6284a474532aeb09 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Tue, 19 Mar 2019 20:14:53 +0200 Subject: Bump VID version to 3.2.3 Planned as part of Casablanca maintenance release (3.0.2). Issue-ID: VID-446 Change-Id: I96f3cd9e59eddc43a249d102c70b558f4fad54e6 Signed-off-by: Ittay Stern --- docs/installation.rst | 4 +- docs/release-notes.rst | 9 + epsdk-app-onap/pom.xml | 948 ++++++++++++++--------------- epsdk-app-onap/version.properties | 26 +- pom.xml | 544 ++++++++--------- version.properties | 26 +- vid-app-common/pom.xml | 1178 ++++++++++++++++++------------------- vid-app-common/version.properties | 26 +- 8 files changed, 1385 insertions(+), 1376 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index f9d12e8b8..75b1c703c 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -17,7 +17,7 @@ Please follow the instructions given below, for installing VID using a Docker im docker pull mariadb:10 docker login -u docker -p docker nexus3.onap.org:10001 - docker pull nexus3.onap.org:10001/onap/vid:3.2.1 + docker pull nexus3.onap.org:10001/onap/vid:3.2.3 2. Install by running following command (Use the path for the lf_config folder under the VID git repository as CONFIG_PATH) @@ -27,7 +27,7 @@ Please follow the instructions given below, for installing VID using a Docker im docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=YOUR_PASSWORD -e MYSQL_ROOT_PASSWORD=ROOT_PASSWORD -v CONFIG_PATH/vid-my.cnf:/etc/mysql/my.cnf -v /var/lib/mysql -d mariadb:10 #start VID server - docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=YOUR_PASSWORD --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/vid:3.2.1 + docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=YOUR_PASSWORD --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/vid:3.2.3 Or use docker-compose: diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 962fe1b07..ce682cdb1 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -3,6 +3,15 @@ VID Release Notes ================= +Version: 3.2.3 +-------------- + +:Release Date: 2019-03-28 + +**Notes** +It's v3.2.2, but repackaged with a new certificate valid until March 12, 2020. + + Version: 3.2.2 -------------- diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index c5344fb88..267e77032 100755 --- a/epsdk-app-onap/pom.xml +++ b/epsdk-app-onap/pom.xml @@ -1,474 +1,474 @@ - - - 4.0.0 - - - org.onap.vid - epsdk-app-onap - 3.2.2-SNAPSHOT - war - ECOMP SDK Webapp for OpenSource - ECOMP SDK Web Application for public release - - - UTF-8 - UTF-8 - UTF-8 - 2.4.0 - 4.2.9.RELEASE - 4.3.11.Final - - true - - false - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ - /content/sites/site/org/onap/vid/${project.version} - - - java - jacoco - ${project.build.directory}/surefire-reports - ${project.version} - - - - - ecomp-releases - VID Release Repository - ${nexusproxy}${releaseNexusPath} - - - ecomp-snapshots - VID Snapshot Repository - ${nexusproxy}${snapshotNexusPath} - - - ecomp-staging - VID Staging Repository - ${nexusproxy}${stagingNexusPath} - - - - oss-snapshots - oss Central - Snapshots - https://oss.sonatype.org/service/local/repositories/releases/content/ - - - - - ecomp-releases - VID Release Repository - ${nexusproxy}/${releaseNexusPath} - - - ecomp-snapshots - VID Snapshot Repository - ${nexusproxy}/${snapshotNexusPath} - - - - ecomp-site - dav:${nexusproxy}${sitePath} - - - - - - - doclint-java8-disable - - [1.8,) - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - -Xdoclint:none - - - - - - - - - vid - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - ${skiptests} - - **/Test*.java - **/*Test.java - **/*TestCase.java - - - ${basedir}/war - - - classpath: - - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.2 - - - - true - - - ${project.version} - ${maven.build.timestamp} - - - - - org.onap.vid - vid-app-common - - - org.onap.portal.sdk - epsdk-app-overlay - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.0.0 - - ${skipassembly} - - ${basedir}/distribution.xml - - - - - make-assembly - package - - single - - - - - - org.apache.maven.plugins - maven-site-plugin - 3.6 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - - - maven-surefire-plugin - 2.17 - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.3.0.603 - - - org.jacoco - jacoco-maven-plugin - 0.7.9 - - - default-prepare-agent - - prepare-agent - - - - default-report - - report - - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - false - org.umlgraph.doclet.UmlGraphDoc - - org.umlgraph - umlgraph - 5.6 - - -views - true - - - - - - - - org.onap.portal.sdk - epsdk-app-overlay - ${epsdk.version} - war - - - org.onap.portal.sdk - epsdk-app-common - ${epsdk.version} - jar - - - com.fasterxml.jackson.core - jackson-core - - - - - org.onap.vid - vid-app-common - ${project.version} - war - - - com.fasterxml.jackson.core - jackson-core - - - - - org.onap.vid - vid-app-common - ${project.version} - jar - classes - - - - org.onap.portal.sdk - epsdk-core - ${epsdk.version} - - - com.fasterxml.jackson.core - jackson-core - - - - - org.onap.portal.sdk - epsdk-analytics - ${epsdk.version} - - - com.fasterxml.jackson.core - jackson-core - - - com.lowagie - itext - - - - - org.onap.portal.sdk - epsdk-workflow - ${epsdk.version} - - - com.fasterxml.jackson.core - jackson-core - - - - - com.att.eelf - eelf-core - 1.0.0 - - - - - - - org.onap.vid - vid-app-common - ${version} - war - - - org.onap.vid - vid-app-common - ${version} - jar - classes - - - - com.fasterxml.jackson.core - jackson-annotations - 2.6.3 - - - com.fasterxml.jackson.core - jackson-core - 2.8.6 - - - com.fasterxml.jackson.core - jackson-databind - 2.6.7.1 - - - com.fasterxml.jackson.core - jackson-core - - - - - com.mchange - c3p0 - 0.9.5.2 - - - io.searchbox - jest - 2.0.0 - - - commons-logging - commons-logging - - - - - javax.servlet - javax.servlet-api - 3.1.0 - - - junit - junit - 4.12 - - - org.json - json - 20160212 - - - org.quartz-scheduler - quartz - 2.2.1 - - - - c3p0 - c3p0 - - - - - - org.slf4j - jcl-over-slf4j - 1.7.12 - - - org.springframework - spring-context-support - ${springframework.version} - - - org.springframework - spring-core - ${springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-aop - ${springframework.version} - - - org.springframework - spring-test - ${springframework.version} - - - org.springframework - spring-tx - ${springframework.version} - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework - spring-webmvc - ${springframework.version} - - - + + + 4.0.0 + + + org.onap.vid + epsdk-app-onap + 3.2.3-SNAPSHOT + war + ECOMP SDK Webapp for OpenSource + ECOMP SDK Web Application for public release + + + UTF-8 + UTF-8 + UTF-8 + 2.4.0 + 4.2.9.RELEASE + 4.3.11.Final + + true + + false + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/vid/${project.version} + + + java + jacoco + ${project.build.directory}/surefire-reports + ${project.version} + + + + + ecomp-releases + VID Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + VID Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-staging + VID Staging Repository + ${nexusproxy}${stagingNexusPath} + + + + oss-snapshots + oss Central - Snapshots + https://oss.sonatype.org/service/local/repositories/releases/content/ + + + + + ecomp-releases + VID Release Repository + ${nexusproxy}/${releaseNexusPath} + + + ecomp-snapshots + VID Snapshot Repository + ${nexusproxy}/${snapshotNexusPath} + + + + ecomp-site + dav:${nexusproxy}${sitePath} + + + + + + + doclint-java8-disable + + [1.8,) + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + -Xdoclint:none + + + + + + + + + vid + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + ${skiptests} + + **/Test*.java + **/*Test.java + **/*TestCase.java + + + ${basedir}/war + + + classpath: + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.0.2 + + + + true + + + ${project.version} + ${maven.build.timestamp} + + + + + org.onap.vid + vid-app-common + + + org.onap.portal.sdk + epsdk-app-overlay + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.0.0 + + ${skipassembly} + + ${basedir}/distribution.xml + + + + + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + + + + maven-surefire-plugin + 2.17 + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.3.0.603 + + + org.jacoco + jacoco-maven-plugin + 0.7.9 + + + default-prepare-agent + + prepare-agent + + + + default-report + + report + + + + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + + + + + + + + org.onap.portal.sdk + epsdk-app-overlay + ${epsdk.version} + war + + + org.onap.portal.sdk + epsdk-app-common + ${epsdk.version} + jar + + + com.fasterxml.jackson.core + jackson-core + + + + + org.onap.vid + vid-app-common + ${project.version} + war + + + com.fasterxml.jackson.core + jackson-core + + + + + org.onap.vid + vid-app-common + ${project.version} + jar + classes + + + + org.onap.portal.sdk + epsdk-core + ${epsdk.version} + + + com.fasterxml.jackson.core + jackson-core + + + + + org.onap.portal.sdk + epsdk-analytics + ${epsdk.version} + + + com.fasterxml.jackson.core + jackson-core + + + com.lowagie + itext + + + + + org.onap.portal.sdk + epsdk-workflow + ${epsdk.version} + + + com.fasterxml.jackson.core + jackson-core + + + + + com.att.eelf + eelf-core + 1.0.0 + + + + + + + org.onap.vid + vid-app-common + ${version} + war + + + org.onap.vid + vid-app-common + ${version} + jar + classes + + + + com.fasterxml.jackson.core + jackson-annotations + 2.6.3 + + + com.fasterxml.jackson.core + jackson-core + 2.8.6 + + + com.fasterxml.jackson.core + jackson-databind + 2.6.7.1 + + + com.fasterxml.jackson.core + jackson-core + + + + + com.mchange + c3p0 + 0.9.5.2 + + + io.searchbox + jest + 2.0.0 + + + commons-logging + commons-logging + + + + + javax.servlet + javax.servlet-api + 3.1.0 + + + junit + junit + 4.12 + + + org.json + json + 20160212 + + + org.quartz-scheduler + quartz + 2.2.1 + + + + c3p0 + c3p0 + + + + + + org.slf4j + jcl-over-slf4j + 1.7.12 + + + org.springframework + spring-context-support + ${springframework.version} + + + org.springframework + spring-core + ${springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-aop + ${springframework.version} + + + org.springframework + spring-test + ${springframework.version} + + + org.springframework + spring-tx + ${springframework.version} + + + org.springframework + spring-web + ${springframework.version} + + + org.springframework + spring-webmvc + ${springframework.version} + + + diff --git a/epsdk-app-onap/version.properties b/epsdk-app-onap/version.properties index ef8c0e340..527c3bae9 100644 --- a/epsdk-app-onap/version.properties +++ b/epsdk-app-onap/version.properties @@ -1,13 +1,13 @@ -# Versioning variables -# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) -# because they are used in Jenkins, whose plug-in doesn't support - -major=3 -minor=2 -patch=2 - -base_version=${major}.${minor}.${patch} - -# Release must be completed with git revision # in Jenkins -release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT +# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support + +major=3 +minor=2 +patch=3 + +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7a170f32a..215bdd1ee 100644 --- a/pom.xml +++ b/pom.xml @@ -1,272 +1,272 @@ - - 4.0.0 - org.onap.vid - vid-parent - pom - vid - - - - - - onap - - true - - - vid-app-common - vid-webpack-master - epsdk-app-onap - - - - - - - ecomp-releases - VID Release Repository - ${nexusproxy}/${releaseNexusPath} - - - ecomp-snapshots - VID Snapshot Repository - ${nexusproxy}/${snapshotNexusPath} - - - ecomp-staging - VID Staging Repository - ${nexusproxy}/${stagingNexusPath} - - - - oss-snapshots - oss Central - Snapshots - https://oss.sonatype.org/service/local/repositories/releases/content/ - - - - - - ecomp-releases - VID Release Repository - ${nexusproxy}/${releaseNexusPath} - - - ecomp-snapshots - VID Snapshot Repository - ${nexusproxy}/${snapshotNexusPath} - - - - ecomp-site - dav:${nexusproxy}${sitePath} - - - - - - - docker - - vid-app-common - vid-webpack-master - epsdk-app-onap - deliveries - - - - - - UTF-8 - UTF-8 - 3.2.2-SNAPSHOT - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ - /content/sites/site/org/onap/vid/${project.version} - - - - - - org.codehaus.mojo - versions-maven-plugin - 1.3.1 - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - - org.apache.maven.plugins - maven-site-plugin - 3.6 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - - true - -Xlint - true - true - true - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-site-plugin - 3.6 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.3.0.603 - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - - - - - - - - JCenter - JCenter Repository - http://jcenter.bintray.com - - - - Restlet - Restlet Repository - http://maven.restlet.com - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - false - org.umlgraph.doclet.UmlGraphDoc - - org.umlgraph - umlgraph - 5.6 - - -views - true - - - - - - - junit - junit - 4.11 - test - - - - - ch.qos.logback - logback-core - 1.2.3 - - - ch.qos.logback - logback-classic - 1.2.3 - - - commons-collections - commons-collections - 3.2.2 - - - org.apache.poi - poi - 3.17 - - - org.apache.httpcomponents - httpclient - 4.5.3 - - - 3.2.2-SNAPSHOT - + + 4.0.0 + org.onap.vid + vid-parent + pom + vid + + + + + + onap + + true + + + vid-app-common + vid-webpack-master + epsdk-app-onap + + + + + + + ecomp-releases + VID Release Repository + ${nexusproxy}/${releaseNexusPath} + + + ecomp-snapshots + VID Snapshot Repository + ${nexusproxy}/${snapshotNexusPath} + + + ecomp-staging + VID Staging Repository + ${nexusproxy}/${stagingNexusPath} + + + + oss-snapshots + oss Central - Snapshots + https://oss.sonatype.org/service/local/repositories/releases/content/ + + + + + + ecomp-releases + VID Release Repository + ${nexusproxy}/${releaseNexusPath} + + + ecomp-snapshots + VID Snapshot Repository + ${nexusproxy}/${snapshotNexusPath} + + + + ecomp-site + dav:${nexusproxy}${sitePath} + + + + + + + docker + + vid-app-common + vid-webpack-master + epsdk-app-onap + deliveries + + + + + + UTF-8 + UTF-8 + 3.2.3-SNAPSHOT + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/vid/${project.version} + + + + + + org.codehaus.mojo + versions-maven-plugin + 1.3.1 + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + + true + -Xlint + true + true + true + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.3.0.603 + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + + + + + + + + JCenter + JCenter Repository + http://jcenter.bintray.com + + + + Restlet + Restlet Repository + http://maven.restlet.com + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + + + + + + + junit + junit + 4.11 + test + + + + + ch.qos.logback + logback-core + 1.2.3 + + + ch.qos.logback + logback-classic + 1.2.3 + + + commons-collections + commons-collections + 3.2.2 + + + org.apache.poi + poi + 3.17 + + + org.apache.httpcomponents + httpclient + 4.5.3 + + + 3.2.3-SNAPSHOT + diff --git a/version.properties b/version.properties index ef8c0e340..527c3bae9 100644 --- a/version.properties +++ b/version.properties @@ -1,13 +1,13 @@ -# Versioning variables -# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) -# because they are used in Jenkins, whose plug-in doesn't support - -major=3 -minor=2 -patch=2 - -base_version=${major}.${minor}.${patch} - -# Release must be completed with git revision # in Jenkins -release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT +# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support + +major=3 +minor=2 +patch=3 + +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index f2a9690c4..ac4c4af85 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -1,589 +1,589 @@ - - - 4.0.0 - - - org.onap.vid - vid-app-common - 3.2.2-SNAPSHOT - war - VID Common - VID Common code for opensource version - - - UTF-8 - UTF-8 - UTF-8 - 2.4.0 - 4.2.9.RELEASE - 4.3.11.Final - - true - - false - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ - /content/sites/site/org/onap/vid/${project.version} - - - - - - - - - ecomp-releases - VID Release Repository - ${nexusproxy}${releaseNexusPath} - - - ecomp-snapshots - VID Snapshot Repository - ${nexusproxy}${snapshotNexusPath} - - - ecomp-staging - VID Staging Repository - ${nexusproxy}${stagingNexusPath} - - - - oss-snapshots - oss Central - Snapshots - https://oss.sonatype.org/service/local/repositories/releases/content/ - - - - - - ecomp-releases - VID Release Repository - ${nexusproxy}/${releaseNexusPath} - - - ecomp-snapshots - VID Snapshot Repository - ${nexusproxy}/${snapshotNexusPath} - - - - ecomp-site - dav:${nexusproxy}${sitePath} - - - - - vid-common - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - org.jacoco - jacoco-maven-plugin - 0.7.9 - - - default-prepare-agent - - prepare-agent - - - - default-report - - report - - - - - - org.apache.tomcat.maven - tomcat6-maven-plugin - 2.2 - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - - - - - org.jsonschema2pojo - jsonschema2pojo-maven-plugin - 0.4.23 - - ${basedir}/src/main/resources/json/mso - org.onap.vid.domain.mso - ${project.build.directory}/generated-sources - - - - - generate - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - ${skiptests} - - **/Test*.java - **/*Test.java - **/*TestCase.java - - - **/selenium/*.java - **/integrationTest/*.java - - - ${basedir}/war - - - classpath: - - - - - - maven-assembly-plugin - - ${skipassembly} - - ${basedir}/distribution.xml - - - - - make-assembly - package - - single - - - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.0.0 - - - true - - WEB-INF/lib/*.jar - - - - org.apache.maven.plugins - maven-site-plugin - 3.6 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - - pl.project13.maven - git-commit-id-plugin - 2.2.4 - - - get-the-git-infos - - revision - - - - - ${project.basedir}/.git - yyyy-MM-dd'T'HH:mm:ssZ - ${user.timezone} - true - ${project.build.outputDirectory}/git.properties - - ^git.commit.id$ - ^git.commit.message.short$ - ^git.commit.time$ - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - false - org.umlgraph.doclet.UmlGraphDoc - - org.umlgraph - umlgraph - 5.6 - - -views - true - - - - - - - - - com.opencsv - opencsv - 4.1 - - - - - - io.joshworks.unirest - unirest-java - 0.2.1 - - - org.apache.httpcomponents - httpclient - 4.3.6 - - - org.apache.httpcomponents - httpasyncclient - 4.0.2 - - - org.apache.httpcomponents - httpmime - 4.3.6 - - - com.xebialabs.restito - restito - 0.9.3 - test - - - - - org.projectlombok - lombok - 1.18.2 - provided - - - io.vavr - vavr - 0.9.2 - - - - - org.onap.portal.sdk - epsdk-app-overlay - ${epsdk.version} - war - - - org.onap.portal.sdk - epsdk-app-common - ${epsdk.version} - jar - - - - org.onap.portal.sdk - epsdk-core - ${epsdk.version} - - - org.onap.portal.sdk - epsdk-analytics - ${epsdk.version} - - - com.lowagie - itext - - - - - org.onap.portal.sdk - epsdk-workflow - ${epsdk.version} - - - com.att.eelf - eelf-core - 1.0.0 - - - ch.qos.logback - logback-core - 1.2.3 - - - ch.qos.logback - logback-classic - 1.2.3 - - - - - com.fasterxml.jackson.core - jackson-annotations - 2.6.3 - - - com.fasterxml.jackson.core - jackson-core - 2.8.6 - - - com.fasterxml.jackson.core - jackson-databind - 2.6.7.1 - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - - - com.mchange - c3p0 - 0.9.5.2 - - - io.searchbox - jest - 2.0.0 - - - commons-logging - commons-logging - - - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - junit - junit - 4.12 - - - commons-io - commons-io - 2.4 - - - - com.google.code.bean-matchers - bean-matchers - 0.11 - test - - - org.json - json - 20160212 - - - org.quartz-scheduler - quartz - 2.2.1 - - - - c3p0 - c3p0 - - - - - - org.slf4j - jcl-over-slf4j - 1.7.12 - - - org.springframework - spring-context-support - ${springframework.version} - - - org.springframework - spring-core - ${springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-test - ${springframework.version} - - - org.springframework - spring-tx - ${springframework.version} - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework - spring-webmvc - ${springframework.version} - - - org.glassfish.jersey.core - jersey-client - 2.23.1 - - - org.glassfish.jersey.connectors - jersey-jetty-connector - 2.23.1 - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - 2.6.3 - - - commons-beanutils - commons-beanutils - 1.9.3 - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - org.seleniumhq.selenium - selenium-java - 2.53.1 - test - - - org.seleniumhq.selenium - selenium-api - 2.53.1 - test - - - org.testng - testng - 6.8 - test - - - org.seleniumhq.selenium - selenium-firefox-driver - 2.53.1 - - - xml-apis - xml-apis - 1.4.01 - - - org.yaml - snakeyaml - 1.16 - - - org.skyscreamer - jsonassert - 1.5.0 - - - org.onap.sdc.sdc-tosca - sdc-tosca - 1.4.1 - compile - - - net.javacrumbs.json-unit - json-unit - 1.23.0 - test - - - org.apache.commons - commons-text - 1.1 - - - org.hamcrest - java-hamcrest - 2.0.0.0 - test - - - org.togglz - togglz-spring-core - 2.5.0.Final - - - org.assertj - assertj-core - 3.10.0 - compile - - - + + + 4.0.0 + + + org.onap.vid + vid-app-common + 3.2.3-SNAPSHOT + war + VID Common + VID Common code for opensource version + + + UTF-8 + UTF-8 + UTF-8 + 2.4.0 + 4.2.9.RELEASE + 4.3.11.Final + + true + + false + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/vid/${project.version} + + + + + + + + + ecomp-releases + VID Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + VID Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-staging + VID Staging Repository + ${nexusproxy}${stagingNexusPath} + + + + oss-snapshots + oss Central - Snapshots + https://oss.sonatype.org/service/local/repositories/releases/content/ + + + + + + ecomp-releases + VID Release Repository + ${nexusproxy}/${releaseNexusPath} + + + ecomp-snapshots + VID Snapshot Repository + ${nexusproxy}/${snapshotNexusPath} + + + + ecomp-site + dav:${nexusproxy}${sitePath} + + + + + vid-common + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + org.jacoco + jacoco-maven-plugin + 0.7.9 + + + default-prepare-agent + + prepare-agent + + + + default-report + + report + + + + + + org.apache.tomcat.maven + tomcat6-maven-plugin + 2.2 + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + + + + org.jsonschema2pojo + jsonschema2pojo-maven-plugin + 0.4.23 + + ${basedir}/src/main/resources/json/mso + org.onap.vid.domain.mso + ${project.build.directory}/generated-sources + + + + + generate + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + ${skiptests} + + **/Test*.java + **/*Test.java + **/*TestCase.java + + + **/selenium/*.java + **/integrationTest/*.java + + + ${basedir}/war + + + classpath: + + + + + + maven-assembly-plugin + + ${skipassembly} + + ${basedir}/distribution.xml + + + + + make-assembly + package + + single + + + + + + + + org.apache.maven.plugins + maven-war-plugin + 3.0.0 + + + true + + WEB-INF/lib/*.jar + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + + + pl.project13.maven + git-commit-id-plugin + 2.2.4 + + + get-the-git-infos + + revision + + + + + ${project.basedir}/.git + yyyy-MM-dd'T'HH:mm:ssZ + ${user.timezone} + true + ${project.build.outputDirectory}/git.properties + + ^git.commit.id$ + ^git.commit.message.short$ + ^git.commit.time$ + + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + + + + + + + + + com.opencsv + opencsv + 4.1 + + + + + + io.joshworks.unirest + unirest-java + 0.2.1 + + + org.apache.httpcomponents + httpclient + 4.3.6 + + + org.apache.httpcomponents + httpasyncclient + 4.0.2 + + + org.apache.httpcomponents + httpmime + 4.3.6 + + + com.xebialabs.restito + restito + 0.9.3 + test + + + + + org.projectlombok + lombok + 1.18.2 + provided + + + io.vavr + vavr + 0.9.2 + + + + + org.onap.portal.sdk + epsdk-app-overlay + ${epsdk.version} + war + + + org.onap.portal.sdk + epsdk-app-common + ${epsdk.version} + jar + + + + org.onap.portal.sdk + epsdk-core + ${epsdk.version} + + + org.onap.portal.sdk + epsdk-analytics + ${epsdk.version} + + + com.lowagie + itext + + + + + org.onap.portal.sdk + epsdk-workflow + ${epsdk.version} + + + com.att.eelf + eelf-core + 1.0.0 + + + ch.qos.logback + logback-core + 1.2.3 + + + ch.qos.logback + logback-classic + 1.2.3 + + + + + com.fasterxml.jackson.core + jackson-annotations + 2.6.3 + + + com.fasterxml.jackson.core + jackson-core + 2.8.6 + + + com.fasterxml.jackson.core + jackson-databind + 2.6.7.1 + + + org.codehaus.jackson + jackson-mapper-asl + 1.9.13 + + + com.mchange + c3p0 + 0.9.5.2 + + + io.searchbox + jest + 2.0.0 + + + commons-logging + commons-logging + + + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + junit + junit + 4.12 + + + commons-io + commons-io + 2.4 + + + + com.google.code.bean-matchers + bean-matchers + 0.11 + test + + + org.json + json + 20160212 + + + org.quartz-scheduler + quartz + 2.2.1 + + + + c3p0 + c3p0 + + + + + + org.slf4j + jcl-over-slf4j + 1.7.12 + + + org.springframework + spring-context-support + ${springframework.version} + + + org.springframework + spring-core + ${springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-test + ${springframework.version} + + + org.springframework + spring-tx + ${springframework.version} + + + org.springframework + spring-web + ${springframework.version} + + + org.springframework + spring-webmvc + ${springframework.version} + + + org.glassfish.jersey.core + jersey-client + 2.23.1 + + + org.glassfish.jersey.connectors + jersey-jetty-connector + 2.23.1 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.6.3 + + + commons-beanutils + commons-beanutils + 1.9.3 + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + org.seleniumhq.selenium + selenium-java + 2.53.1 + test + + + org.seleniumhq.selenium + selenium-api + 2.53.1 + test + + + org.testng + testng + 6.8 + test + + + org.seleniumhq.selenium + selenium-firefox-driver + 2.53.1 + + + xml-apis + xml-apis + 1.4.01 + + + org.yaml + snakeyaml + 1.16 + + + org.skyscreamer + jsonassert + 1.5.0 + + + org.onap.sdc.sdc-tosca + sdc-tosca + 1.4.1 + compile + + + net.javacrumbs.json-unit + json-unit + 1.23.0 + test + + + org.apache.commons + commons-text + 1.1 + + + org.hamcrest + java-hamcrest + 2.0.0.0 + test + + + org.togglz + togglz-spring-core + 2.5.0.Final + + + org.assertj + assertj-core + 3.10.0 + compile + + + diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties index ef8c0e340..527c3bae9 100755 --- a/vid-app-common/version.properties +++ b/vid-app-common/version.properties @@ -1,13 +1,13 @@ -# Versioning variables -# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) -# because they are used in Jenkins, whose plug-in doesn't support - -major=3 -minor=2 -patch=2 - -base_version=${major}.${minor}.${patch} - -# Release must be completed with git revision # in Jenkins -release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT +# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support + +major=3 +minor=2 +patch=3 + +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg