Changed gc_version to contain only version tag without the 'utPLSQL - Version ' text

jgebal · jgebal · commit efc4fe9e8524 · 2017-08-21T08:37:25.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -34,7 +34,7 @@ env:
     - CURRENT_BRANCH=${TRAVIS_BRANCH}
     - UTPLSQL_REPO="utPLSQL/utPLSQL"
     - UTPLSQL_BUILD_NO="${TRAVIS_BUILD_NUMBER:-0}"
-    - UTPLSQL_VERSION_PLACEHOLDER='utPLSQL - Version'
+    - UTPLSQL_VERSION_PATTERN='v?([0-9X]+\.){3}[0-9X]+'
     - UTPLSQL_VERSION=$(. .travis/get_project_version.sh)
     - UTPLSQL_BUILD_VERSION=$(. .travis/get_project_build_version.sh)
     - UTPLSQL_SOURCES_DIR='source'
diff --git a/.travis/update_project_version.sh b/.travis/update_project_version.sh
@@ -3,7 +3,7 @@
 echo Current branch is "${CURRENT_BRANCH}"
 
 echo Update version in project source files
-find ${UTPLSQL_SOURCES_DIR} -type f -name '*' -exec sed -i -r "s/(${UTPLSQL_VERSION_PLACEHOLDER} )[^']*(')?/\1${UTPLSQL_BUILD_VERSION}\2/" {} \;
+find ${UTPLSQL_SOURCES_DIR} -type f -name '*' -exec sed -i -r "s/${UTPLSQL_VERSION_PATTERN}/${UTPLSQL_BUILD_VERSION}/" {} \;
 echo Source files updated with version tag: ${UTPLSQL_BUILD_VERSION}
 
 echo Update of sonar-project.properties sonar.projectVersion
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -22,7 +22,7 @@ create or replace package ut_utils authid definer is
 
   */
 
-  gc_version                 constant varchar2(50) := 'utPLSQL - Version X.X.X.X';
+  gc_version                 constant varchar2(50) := 'X.X.X.X';
 
   /* Constants: Event names */
   gc_run                     constant varchar2(12) := 'run';
@@ -218,12 +218,12 @@ create or replace package ut_utils authid definer is
   procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data varchar2);
 
   function convert_collection(a_collection ut_varchar2_list) return ut_varchar2_rows;
-  
+
   /**
   * Set session's action and module using dbms_application_info
   */
   procedure set_action(a_text in varchar2);
-  
+
   /**
   * Set session's client info using dbms_application_info
   */
