diff options
Diffstat (limited to 'dbc-client')
-rw-r--r-- | dbc-client/pom.xml | 4 | ||||
-rw-r--r-- | dbc-client/version.properties | 35 |
2 files changed, 2 insertions, 37 deletions
diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml index 5480569..f5fa4af 100644 --- a/dbc-client/pom.xml +++ b/dbc-client/pom.xml @@ -140,7 +140,7 @@ </resource> <resource> <targetPath>${basedir}/target/docker-stage/opt/app/dbc-client/etc</targetPath> - <directory>${basedir}</directory> + <directory>${multiproject.basedir}</directory> <includes> <include>version.properties</include> </includes> @@ -270,7 +270,7 @@ <jettyVersion>9.4.12.RC2</jettyVersion> <eelf.version>1.0.0</eelf.version> <swagger.version>1.5.19</swagger.version> - <artifact.version>1.0.9</artifact.version> + <artifact.version>1.1.6</artifact.version> <!-- SONAR --> <jacoco.version>0.7.7.201606060606</jacoco.version> <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> diff --git a/dbc-client/version.properties b/dbc-client/version.properties deleted file mode 100644 index 8f72e5e..0000000 --- a/dbc-client/version.properties +++ /dev/null @@ -1,35 +0,0 @@ -### -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END============================================ -# =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -### - -# 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=0 -patch=9 -base_version=${major}.${minor}.${patch} - -# Release must be completed with git revision # in Jenkins -release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT |