From 732757d67212ee8ac5c31cf26c8ce9a6382e6355 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 1 Jul 2022 10:35:50 -0400 Subject: [PATCH 01/12] test version increment automation Signed-off-by: pgodithi --- build.gradle | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1c5c95ed..f4d898f4 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext { opensearch_group = "org.opensearch" - opensearch_version = System.getProperty("opensearch.version", "1.3.3-SNAPSHOT") + opensearch_version = project.property('opensearch.version') kotlin_version = System.getProperty("kotlin.version", "1.4.32") } @@ -39,7 +39,7 @@ repositories { } ext { - isSnapshot = "true" == System.getProperty("build.snapshot", "true") + isSnapshot = project.property('build.snapshot') } allprojects { @@ -140,6 +140,15 @@ shadowJar { classifier = null } +task setVersion() { + if(project.hasProperty('newVersion')) { + ant.propertyfile( + file: "gradle.properties") { + entry( key: "opensearch.version", value: "${newVersion}") + } + } +} + task sourcesJar(type: Jar) { classifier = 'sources' from sourceSets.main.allJava From b6e936002ec5855c2868cd02d53777468e357915 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 1 Jul 2022 10:37:08 -0400 Subject: [PATCH 02/12] test version increment automation Signed-off-by: pgodithi --- gradle.properties | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 gradle.properties diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..a504d4f2 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,7 @@ +#Thu, 30 Jun 2022 18:16:49 -0400 + +# Copyright OpenSearch Contributors +# SPDX-License-Identifier: Apache-2.0 + +opensearch.version=1.3.3-SNAPSHOT +build.snapshot=true From 172a3af1b87a3dc4ea68d2de1c7e19c7c87a02b6 Mon Sep 17 00:00:00 2001 From: opensearch-ci-bot Date: Fri, 1 Jul 2022 14:38:05 +0000 Subject: [PATCH 03/12] Version Increment. Signed-off-by: opensearch-ci-bot --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a504d4f2..bae97312 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ -#Thu, 30 Jun 2022 18:16:49 -0400 +#Fri, 01 Jul 2022 14:38:04 +0000 # Copyright OpenSearch Contributors # SPDX-License-Identifier: Apache-2.0 -opensearch.version=1.3.3-SNAPSHOT +opensearch.version=1.3.4-SNAPSHOT build.snapshot=true From 1919673e49b07d5bdd5de1a6eaa5ce91a8585bc9 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 1 Jul 2022 10:41:18 -0400 Subject: [PATCH 04/12] test version increment automation Signed-off-by: pgodithi --- scripts/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index f68dc52e..b0f7f81a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -59,8 +59,8 @@ fi [[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT [ -z "$OUTPUT" ] && OUTPUT=artifacts -./gradlew build -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -./gradlew publishShadowPublicationToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -./gradlew publishShadowPublicationToStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT +./gradlew build -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT +./gradlew publishShadowPublicationToMavenLocal -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT +./gradlew publishShadowPublicationToStagingRepository -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT mkdir -p $OUTPUT/maven/org/opensearch cp -r ./build/local-staging-repo/org/opensearch/common-utils $OUTPUT/maven/org/opensearch/common-utils From b0d8147246af5c31c7b0159999e6097bbf109ecc Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 1 Jul 2022 10:43:08 -0400 Subject: [PATCH 05/12] test version increment automation Signed-off-by: pgodithi --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bae97312..25bf9eb1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ # Copyright OpenSearch Contributors # SPDX-License-Identifier: Apache-2.0 -opensearch.version=1.3.4-SNAPSHOT +opensearch.version=1.3.3-SNAPSHOT build.snapshot=true From b3a3d3d7338394b7bcc61fc0a9d1d762c778fd59 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Thu, 7 Jul 2022 16:26:31 -0400 Subject: [PATCH 06/12] version increment automation Signed-off-by: pgodithi --- build.gradle | 15 +++++++++------ gradle.properties | 7 ------- 2 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 gradle.properties diff --git a/build.gradle b/build.gradle index f4d898f4..341a3bb4 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext { opensearch_group = "org.opensearch" - opensearch_version = project.property('opensearch.version') + opensearch_version = System.getProperty("opensearch.version", "1.3.3-SNAPSHOT") kotlin_version = System.getProperty("kotlin.version", "1.4.32") } @@ -39,7 +39,7 @@ repositories { } ext { - isSnapshot = project.property('build.snapshot') + isSnapshot = "true" == System.getProperty("build.snapshot", "true") } allprojects { @@ -140,11 +140,14 @@ shadowJar { classifier = null } -task setVersion() { +task versionIncrement { if(project.hasProperty('newVersion')) { - ant.propertyfile( - file: "gradle.properties") { - entry( key: "opensearch.version", value: "${newVersion}") + println 'Set Project to new Version '+newVersion.tokenize('-')[0] + final String workingDir = project.buildDir.toString() + "/../" + ant.replaceregexp(match: opensearch_version.tokenize('-')[0], replace: newVersion.tokenize('-')[0], flags:'g', byline:true) { + fileset(dir: workingDir) { + include(name: "build.gradle") + } } } } diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 25bf9eb1..00000000 --- a/gradle.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Fri, 01 Jul 2022 14:38:04 +0000 - -# Copyright OpenSearch Contributors -# SPDX-License-Identifier: Apache-2.0 - -opensearch.version=1.3.3-SNAPSHOT -build.snapshot=true From 65111c0346d96065074881cfc9678fef171d35d3 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Thu, 7 Jul 2022 16:27:38 -0400 Subject: [PATCH 07/12] version increment automation Signed-off-by: pgodithi --- scripts/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index b0f7f81a..f68dc52e 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -59,8 +59,8 @@ fi [[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT [ -z "$OUTPUT" ] && OUTPUT=artifacts -./gradlew build -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT -./gradlew publishShadowPublicationToMavenLocal -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT -./gradlew publishShadowPublicationToStagingRepository -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT +./gradlew build -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT +./gradlew publishShadowPublicationToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT +./gradlew publishShadowPublicationToStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT mkdir -p $OUTPUT/maven/org/opensearch cp -r ./build/local-staging-repo/org/opensearch/common-utils $OUTPUT/maven/org/opensearch/common-utils From 39c587c35dd29043d6e36c80b67309e510596c9a Mon Sep 17 00:00:00 2001 From: pgodithi Date: Thu, 7 Jul 2022 20:30:53 -0400 Subject: [PATCH 08/12] Version increment automation Signed-off-by: pgodithi --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 341a3bb4..f7007b39 100644 --- a/build.gradle +++ b/build.gradle @@ -141,14 +141,15 @@ shadowJar { } task versionIncrement { - if(project.hasProperty('newVersion')) { - println 'Set Project to new Version '+newVersion.tokenize('-')[0] + onlyIf { project.hasProperty('newVersion') } + doLast { final String workingDir = project.buildDir.toString() + "/../" ant.replaceregexp(match: opensearch_version.tokenize('-')[0], replace: newVersion.tokenize('-')[0], flags:'g', byline:true) { fileset(dir: workingDir) { include(name: "build.gradle") } } + println "Setting version to ${project.getProperty('newVersion')}." } } From c73b516b86d053db4fb76fdc48ad19510875c3fd Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 8 Jul 2022 11:19:06 -0400 Subject: [PATCH 09/12] Version increment automation Signed-off-by: pgodithi --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f7007b39..aa1a50a8 100644 --- a/build.gradle +++ b/build.gradle @@ -141,15 +141,16 @@ shadowJar { } task versionIncrement { - onlyIf { project.hasProperty('newVersion') } + onlyIf { System.getProperty('newVersion') } doLast { + ext.newVersion = System.getProperty('newVersion') + println "Setting version to ${newVersion}." final String workingDir = project.buildDir.toString() + "/../" ant.replaceregexp(match: opensearch_version.tokenize('-')[0], replace: newVersion.tokenize('-')[0], flags:'g', byline:true) { fileset(dir: workingDir) { include(name: "build.gradle") } } - println "Setting version to ${project.getProperty('newVersion')}." } } From 05e28f52072528353b459766744873eadd848957 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 8 Jul 2022 14:09:04 -0400 Subject: [PATCH 10/12] Version increment automation Signed-off-by: pgodithi --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index aa1a50a8..58d29839 100644 --- a/build.gradle +++ b/build.gradle @@ -145,9 +145,9 @@ task versionIncrement { doLast { ext.newVersion = System.getProperty('newVersion') println "Setting version to ${newVersion}." - final String workingDir = project.buildDir.toString() + "/../" + // String tokenization to support -SNAPSHOT ant.replaceregexp(match: opensearch_version.tokenize('-')[0], replace: newVersion.tokenize('-')[0], flags:'g', byline:true) { - fileset(dir: workingDir) { + fileset(dir: projectDir) { include(name: "build.gradle") } } From 9b52d7f58d0889b3b8d421c2f25c2e53de0e2040 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 8 Jul 2022 14:17:17 -0400 Subject: [PATCH 11/12] Version increment automation Signed-off-by: pgodithi --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 58d29839..b9e65247 100644 --- a/build.gradle +++ b/build.gradle @@ -140,6 +140,7 @@ shadowJar { classifier = null } +// versionIncrement: Task to auto increment to the next development iteration task versionIncrement { onlyIf { System.getProperty('newVersion') } doLast { @@ -148,6 +149,7 @@ task versionIncrement { // 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: "build.gradle") } } From 89ba85a5f0709b9cb3891086a6783db038d9e626 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Tue, 12 Jul 2022 17:46:34 -0400 Subject: [PATCH 12/12] Version increment automation: task rename updateVersion Signed-off-by: pgodithi --- build.gradle | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index b9e65247..8f0073a5 100644 --- a/build.gradle +++ b/build.gradle @@ -140,22 +140,6 @@ shadowJar { classifier = null } -// 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: "build.gradle") - } - } - } -} - task sourcesJar(type: Jar) { classifier = 'sources' from sourceSets.main.allJava @@ -211,3 +195,15 @@ publishing { gradle.startParameter.setShowStacktrace(ShowStacktrace.ALWAYS) gradle.startParameter.setLogLevel(LogLevel.DEBUG) } + +// updateVersion: Task to auto increment to the next development iteration +task updateVersion { + onlyIf { System.getProperty('newVersion') } + doLast { + ext.newVersion = System.getProperty('newVersion') + println "Setting version to ${newVersion}." + // String tokenization to support -SNAPSHOT + // Include the required files that needs to be updated with new Version + ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true) + } +} \ No newline at end of file