diff options
author | Kiran Kamineni <kiran.k.kamineni@intel.com> | 2018-06-06 15:02:11 -0700 |
---|---|---|
committer | Kiran Kamineni <kiran.k.kamineni@intel.com> | 2018-06-06 15:02:17 -0700 |
commit | 8eb91b97baac63b085a8d75407b85841ff9f4444 (patch) | |
tree | 4e2910869f85f204eea13ea845aaf9e612b39699 /sms-client/java | |
parent | 926b4118716f34f02294d57c20a27a1df5803aba (diff) |
Move version.properties as its not configurablev2.0.02.0.0-ONAPbeijing2.0.0-ONAP
Version.properties path is not configurable in jenkins
global templates. Therefore moving it to root of repo.
Issue-ID: AAF-330
Change-Id: If0106b59e04b01d0d571878b74399c242041ff91
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
Diffstat (limited to 'sms-client/java')
-rw-r--r-- | sms-client/java/pom.xml | 70 | ||||
-rw-r--r-- | sms-client/java/version.properties | 9 |
2 files changed, 35 insertions, 44 deletions
diff --git a/sms-client/java/pom.xml b/sms-client/java/pom.xml index 6609285..b6e21ab 100644 --- a/sms-client/java/pom.xml +++ b/sms-client/java/pom.xml @@ -8,11 +8,11 @@ <name>sms-client</name> <properties> - <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/aaf/sms/${project.artifactId}/${project.version}</sitePath> + <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/aaf/sms/${project.artifactId}/${project.version}</sitePath> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> @@ -32,22 +32,22 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>false</skip> - </configuration> - </plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <nexusUrl>${nexusproxy}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <nexusUrl>${nexusproxy}</nexusUrl> + <stagingProfileId>176c31dfe190a</stagingProfileId> + <serverId>ecomp-staging</serverId> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> @@ -73,20 +73,20 @@ </build> <distributionManagement> - <repository> - <id>ecomp-releases</id> - <name>AAF SMS Release Repository</name> - <url>${nexusproxy}${releaseNexusPath}</url> - </repository> - <snapshotRepository> - <id>ecomp-snapshots</id> - <name>AAF SMS Snapshot Repository</name> - <url>${nexusproxy}${snapshotNexusPath}</url> - </snapshotRepository> - <site> - <id>ecomp-site</id> - <url>dav:${nexusproxy}${sitePath}</url> - </site> - </distributionManagement> + <repository> + <id>ecomp-releases</id> + <name>AAF SMS Release Repository</name> + <url>${nexusproxy}${releaseNexusPath}</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <name>AAF SMS Snapshot Repository</name> + <url>${nexusproxy}${snapshotNexusPath}</url> + </snapshotRepository> + <site> + <id>ecomp-site</id> + <url>dav:${nexusproxy}${sitePath}</url> + </site> + </distributionManagement> </project> diff --git a/sms-client/java/version.properties b/sms-client/java/version.properties deleted file mode 100644 index b07122b..0000000 --- a/sms-client/java/version.properties +++ /dev/null @@ -1,9 +0,0 @@ -major=2 -minor=0 -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
\ No newline at end of file |