From f88fada056b2a2ec9811b5feca5cf5b43e9786e0 Mon Sep 17 00:00:00 2001 From: jimmydot Date: Sun, 7 May 2017 19:42:59 -0400 Subject: [VID-6] Fixed pom files Change-Id: Ib3c47aba4e7b5c3bf4e73418998b8e700077a7b3 Signed-off-by: jimmydot --- epsdk-app-onap/pom.xml | 34 +++++++++++ epsdk-app-onap/version.properties | 13 +++++ pom.xml | 30 ++++++++++ vid-app-common/pom.xml | 117 +++++++++++++++++++++++++------------- vid-app-common/version.properties | 13 +++++ 5 files changed, 166 insertions(+), 41 deletions(-) create mode 100644 epsdk-app-onap/version.properties create mode 100644 vid-app-common/version.properties diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index e82abd2a..04779409 100755 --- a/epsdk-app-onap/pom.xml +++ b/epsdk-app-onap/pom.xml @@ -84,12 +84,46 @@ 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 + + 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 diff --git a/epsdk-app-onap/version.properties b/epsdk-app-onap/version.properties new file mode 100644 index 00000000..e2595ba1 --- /dev/null +++ b/epsdk-app-onap/version.properties @@ -0,0 +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=1 +minor=1 +patch=0 + +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 839f53ba..746a343e 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,36 @@ + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + + + + 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.codehaus.mojo diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index 5f1a07de..296f5cbf 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -15,54 +15,89 @@ VID Common code for opensource version - UTF-8 - UTF-8 - UTF-8 - 1.1.0-SNAPSHOT - 4.2.0.RELEASE - 4.3.11.Final - - true - - true - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ - /content/sites/site/org/openecomp/vid/${project.version} + UTF-8 + UTF-8 + UTF-8 + 1.1.0-SNAPSHOT + 4.2.0.RELEASE + 4.3.11.Final + + true + + true + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/openecomp/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-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.codehaus.mojo + versions-maven-plugin + 1.3.1 + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + org.codehaus.mojo cobertura-maven-plugin @@ -196,7 +231,7 @@ ${epsdk.version} jar - + org.openecomp.ecompsdkos epsdk-core diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties new file mode 100644 index 00000000..e2595ba1 --- /dev/null +++ b/vid-app-common/version.properties @@ -0,0 +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=1 +minor=1 +patch=0 + +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