From ec10d946dafebcf6bbe6b63b8282e130710b2820 Mon Sep 17 00:00:00 2001 From: pgodithi <pgodithi@amazon.com> Date: Mon, 11 Jul 2022 16:10:56 -0400 Subject: [PATCH 1/5] Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> --- build.gradle | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/build.gradle b/build.gradle index 30c7a9a52a..4224afc3d8 100644 --- a/build.gradle +++ b/build.gradle @@ -148,3 +148,29 @@ configurations.all { resolutionStrategy.force 'commons-codec:commons-codec:1.13' resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre' } + +// versionIncrement: Task to auto increment to the next development iteration +task versionIncrement { + onlyIf { System.getProperty('newVersion') } + doLast { + ext.newVersion = System.getProperty('newVersion') + println "Setting version to ${newVersion}." + // String tokenization to support -SNAPSHOT + ant.replaceregexp(match: opensearch_version.tokenize('-')[0], replace: newVersion.tokenize('-')[0], flags:'g', byline:true) { + fileset(dir: projectDir) { + // Include the required files that needs to be updated with new Version + include(name: ".github/workflows/sql-workbench-test-and-build-workflow.yml") + include(name: "doctest/build.gradle") + include(name: "build.gradle") + } + } + ant.replaceregexp(file:'sql-jdbc/build.gradle', match:"version '\\d+.\\d+.\\d+.\\d+'", replace:"version " + "'" + newVersion.tokenize('-')[0] + '.0' + "'", flags:'g', byline:true) + ant.replaceregexp(match:'"version": "\\d+.\\d+.\\d+.\\d+', replace:'"version": ' + '"' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true) { + fileset(dir: workingDir) { + include(name: "workbench/package.json") + include(name: "workbench/opensearch_dashboards.json") + } + } + ant.replaceregexp(file:'workbench/opensearch_dashboards.json', match:'"opensearchDashboardsVersion": "\\d+.\\d+.\\d+', replace:'"opensearchDashboardsVersion": ' + '"' + newVersion.tokenize('-')[0], flags:'g', byline:true) + } +} From c9f5da3fd72efa847e7d03d35683795073cbaf02 Mon Sep 17 00:00:00 2001 From: pgodithi <pgodithi@amazon.com> Date: Mon, 11 Jul 2022 16:15:51 -0400 Subject: [PATCH 2/5] Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4224afc3d8..a7850e90f7 100644 --- a/build.gradle +++ b/build.gradle @@ -166,7 +166,7 @@ task versionIncrement { } ant.replaceregexp(file:'sql-jdbc/build.gradle', match:"version '\\d+.\\d+.\\d+.\\d+'", replace:"version " + "'" + newVersion.tokenize('-')[0] + '.0' + "'", flags:'g', byline:true) ant.replaceregexp(match:'"version": "\\d+.\\d+.\\d+.\\d+', replace:'"version": ' + '"' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true) { - fileset(dir: workingDir) { + fileset(dir: projectDir) { include(name: "workbench/package.json") include(name: "workbench/opensearch_dashboards.json") } From 86af7c71ce393482fc333965388942125aed165b Mon Sep 17 00:00:00 2001 From: pgodithi <pgodithi@amazon.com> Date: Mon, 11 Jul 2022 16:37:14 -0400 Subject: [PATCH 3/5] Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index a7850e90f7..529c29cced 100644 --- a/build.gradle +++ b/build.gradle @@ -160,11 +160,9 @@ task versionIncrement { fileset(dir: projectDir) { // Include the required files that needs to be updated with new Version include(name: ".github/workflows/sql-workbench-test-and-build-workflow.yml") - include(name: "doctest/build.gradle") include(name: "build.gradle") } } - ant.replaceregexp(file:'sql-jdbc/build.gradle', match:"version '\\d+.\\d+.\\d+.\\d+'", replace:"version " + "'" + newVersion.tokenize('-')[0] + '.0' + "'", flags:'g', byline:true) ant.replaceregexp(match:'"version": "\\d+.\\d+.\\d+.\\d+', replace:'"version": ' + '"' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true) { fileset(dir: projectDir) { include(name: "workbench/package.json") From 7ec9819a50acee69bf126c18cce48487189ffb12 Mon Sep 17 00:00:00 2001 From: pgodithi <pgodithi@amazon.com> Date: Mon, 11 Jul 2022 16:49:13 -0400 Subject: [PATCH 4/5] Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> --- build.gradle | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 529c29cced..c12af7c7d9 100644 --- a/build.gradle +++ b/build.gradle @@ -156,13 +156,8 @@ task versionIncrement { ext.newVersion = System.getProperty('newVersion') println "Setting version to ${newVersion}." // String tokenization to support -SNAPSHOT - ant.replaceregexp(match: opensearch_version.tokenize('-')[0], replace: newVersion.tokenize('-')[0], flags:'g', byline:true) { - fileset(dir: projectDir) { - // Include the required files that needs to be updated with new Version - include(name: ".github/workflows/sql-workbench-test-and-build-workflow.yml") - include(name: "build.gradle") - } - } + ant.replaceregexp(file:'.github/workflows/sql-workbench-test-and-build-workflow.yml', match:'OPENSEARCH_PLUGIN_VERSION: \\d+.\\d+.\\d+.\\d+', replace:'OPENSEARCH_PLUGIN_VERSION: ' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true) + ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true) ant.replaceregexp(match:'"version": "\\d+.\\d+.\\d+.\\d+', replace:'"version": ' + '"' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true) { fileset(dir: projectDir) { include(name: "workbench/package.json") From 13c0ad2b8a581c6df320d885c1e2db8aebc3d194 Mon Sep 17 00:00:00 2001 From: pgodithi <pgodithi@amazon.com> Date: Tue, 12 Jul 2022 18:46:40 -0400 Subject: [PATCH 5/5] Version increment automation: task rename updateVersion Signed-off-by: pgodithi <pgodithi@amazon.com> --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index c12af7c7d9..9e2c1c6b6d 100644 --- a/build.gradle +++ b/build.gradle @@ -149,8 +149,8 @@ configurations.all { resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre' } -// versionIncrement: Task to auto increment to the next development iteration -task versionIncrement { +// updateVersion: Task to auto increment to the next development iteration +task updateVersion { onlyIf { System.getProperty('newVersion') } doLast { ext.newVersion = System.getProperty('newVersion')