From c9e7894c315b52d71ca7eddb520b4a19442e5433 Mon Sep 17 00:00:00 2001 From: Ikram Ikramullah Date: Mon, 19 Feb 2018 10:26:41 -0500 Subject: Correct Placement for version.properties Looks like jenkins parent jobs expect the verison.proeprties file to be one step higher than where it resides rihgt now. Fixed, this - hopefully next jenkins daily job will succeeed. Issue-ID: OPTFRA-124 Change-Id: I3444860123f347bbd532466f7ba7d509831b9af6 Signed-off-by: Ikram Ikramullah --- conductor/version.properties | 28 ---------------------------- version.properties | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 conductor/version.properties create mode 100644 version.properties diff --git a/conductor/version.properties b/conductor/version.properties deleted file mode 100644 index 56533db..0000000 --- a/conductor/version.properties +++ /dev/null @@ -1,28 +0,0 @@ -# -# ------------------------------------------------------------------------- -# Copyright (c) 2015-2017 AT&T Intellectual Property -# -# 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. -# -# ------------------------------------------------------------------------- -# - -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/version.properties b/version.properties new file mode 100644 index 0000000..56533db --- /dev/null +++ b/version.properties @@ -0,0 +1,28 @@ +# +# ------------------------------------------------------------------------- +# Copyright (c) 2015-2017 AT&T Intellectual Property +# +# 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. +# +# ------------------------------------------------------------------------- +# + +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