From 251cadca70ad45ad62f17d97c7e14a1503c14b71 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Thu, 30 Jun 2022 17:55:32 -0400 Subject: [PATCH 1/8] Version increment automation Signed-off-by: pgodithi --- build.gradle | 13 +++++++++++-- gradle.properties | 7 +++++++ scripts/build.sh | 6 +++--- 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 gradle.properties diff --git a/build.gradle b/build.gradle index f15c2878..045c85d5 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.3.3-SNAPSHOT") + opensearch_version = project.property('opensearch.version') } repositories { @@ -61,7 +61,7 @@ testClusters.javaRestTest { } ext { - isSnapshot = "true" == System.getProperty("build.snapshot", "true") + isSnapshot = project.property('build.snapshot') } allprojects { @@ -111,6 +111,15 @@ allprojects { } } +task setVersion() { + if(project.hasProperty('newVersion')) { + ant.propertyfile( + file: "gradle.properties") { + entry( key: "opensearch.version", value: "${newVersion}") + } + } +} + repositories { mavenLocal() mavenCentral() diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..37cfe45d --- /dev/null +++ b/gradle.properties @@ -0,0 +1,7 @@ +#Mon, 27 Jun 2022 12:07:36 -0400 + +# Copyright OpenSearch Contributors +# SPDX-License-Identifier: Apache-2.0 + +opensearch.version=1.3.3-SNAPSHOT +build.snapshot=true diff --git a/scripts/build.sh b/scripts/build.sh index 58e50683..2f298ab1 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -62,12 +62,12 @@ fi [[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT [ -z "$OUTPUT" ] && OUTPUT=artifacts -./gradlew publishToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -./gradlew publishAllPublicationsToStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT +./gradlew publishToMavenLocal -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT +./gradlew publishAllPublicationsToStagingRepository -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT mkdir -p $OUTPUT/maven/org/opensearch cp -r ./build/local-staging-repo/org/opensearch/. $OUTPUT/maven/org/opensearch -./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT +./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT [ -z "$OUTPUT" ] && OUTPUT=artifacts mkdir -p $OUTPUT/plugins cp ./build/distributions/*.zip $OUTPUT/plugins From 1c016e6cbaf37fa8a2585ca0df504b348f410a78 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Thu, 30 Jun 2022 18:17:52 -0400 Subject: [PATCH 2/8] 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 37cfe45d..a504d4f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -#Mon, 27 Jun 2022 12:07:36 -0400 +#Thu, 30 Jun 2022 18:16:49 -0400 # Copyright OpenSearch Contributors # SPDX-License-Identifier: Apache-2.0 From 85c5506047a61962de6666935d4e5b4ed4dae0ee Mon Sep 17 00:00:00 2001 From: opensearch-ci-bot Date: Thu, 30 Jun 2022 22:52:35 +0000 Subject: [PATCH 3/8] 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..024113cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ -#Thu, 30 Jun 2022 18:16:49 -0400 +#Thu, 30 Jun 2022 22:52:32 +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 8fa5c3eb2ed0b0cc6c0e2f14b121119de6795d3f Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 1 Jul 2022 10:43:25 -0400 Subject: [PATCH 4/8] 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 024113cb..09f6840b 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 edac52323b2219e3620347427ba05386c70c9575 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 8 Jul 2022 12:55:07 -0400 Subject: [PATCH 5/8] Version increment automation Signed-off-by: pgodithi --- build.gradle | 26 +++++++++++++++----------- gradle.properties | 7 ------- 2 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 gradle.properties diff --git a/build.gradle b/build.gradle index 045c85d5..91745c30 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin buildscript { ext { - opensearch_version = project.property('opensearch.version') + opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT") } repositories { @@ -61,7 +61,7 @@ testClusters.javaRestTest { } ext { - isSnapshot = project.property('build.snapshot') + isSnapshot = "true" == System.getProperty("build.snapshot", "true") } allprojects { @@ -111,15 +111,6 @@ allprojects { } } -task setVersion() { - if(project.hasProperty('newVersion')) { - ant.propertyfile( - file: "gradle.properties") { - entry( key: "opensearch.version", value: "${newVersion}") - } - } -} - repositories { mavenLocal() mavenCentral() @@ -192,3 +183,16 @@ afterEvaluate { } } } +task versionIncrement { + 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") + } + } + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 09f6840b..00000000 --- a/gradle.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Thu, 30 Jun 2022 22:52:32 +0000 - -# Copyright OpenSearch Contributors -# SPDX-License-Identifier: Apache-2.0 - -opensearch.version=1.3.3-SNAPSHOT -build.snapshot=true From d853bba4562084f0d5fed0fadc11da74fc5f6243 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 8 Jul 2022 12:56:31 -0400 Subject: [PATCH 6/8] 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 2f298ab1..58e50683 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -62,12 +62,12 @@ fi [[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT [ -z "$OUTPUT" ] && OUTPUT=artifacts -./gradlew publishToMavenLocal -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT -./gradlew publishAllPublicationsToStagingRepository -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT +./gradlew publishToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT +./gradlew publishAllPublicationsToStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT mkdir -p $OUTPUT/maven/org/opensearch cp -r ./build/local-staging-repo/org/opensearch/. $OUTPUT/maven/org/opensearch -./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Popensearch.version=$VERSION -Pbuild.snapshot=$SNAPSHOT +./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT [ -z "$OUTPUT" ] && OUTPUT=artifacts mkdir -p $OUTPUT/plugins cp ./build/distributions/*.zip $OUTPUT/plugins From 1885145eaf2098b0b66187d8ebf064cca7e5b87b Mon Sep 17 00:00:00 2001 From: pgodithi Date: Fri, 8 Jul 2022 14:10:35 -0400 Subject: [PATCH 7/8] 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 91745c30..7f2ae621 100644 --- a/build.gradle +++ b/build.gradle @@ -188,9 +188,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 4a83a103f56ce9a572d765b998a8a070dac13550 Mon Sep 17 00:00:00 2001 From: pgodithi Date: Sun, 10 Jul 2022 08:37:28 -0400 Subject: [PATCH 8/8] Version increment automation Signed-off-by: pgodithi --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 7f2ae621..5c3ee865 100644 --- a/build.gradle +++ b/build.gradle @@ -183,6 +183,7 @@ afterEvaluate { } } } +// versionIncrement: Task to auto increment to the next development iteration task versionIncrement { onlyIf { System.getProperty('newVersion') } doLast { @@ -191,6 +192,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") } }