Skip to content

Commit bfab598

Browse files
joshuali925joshuali925
committed
2 parents 1bb9a46 + 7ea1d00 commit bfab598

10 files changed

Lines changed: 25 additions & 7 deletions

‎.github/workflows/dashboards-reports-test-and-build-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ env:
66
PLUGIN_NAME: reportsDashboards
77
ARTIFACT_NAME: reports-dashboards
88
OPENSEARCH_VERSION: '1.3'
9-
OPENSEARCH_PLUGIN_VERSION: 1.3.4.0
9+
OPENSEARCH_PLUGIN_VERSION: 1.3.5.0
1010

1111
jobs:
1212
build:

‎.github/workflows/draft-release-notes-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
with:
1717
config-name: draft-release-notes-config.yml
1818
tag: (None)
19-
version: 1.3.4.0
19+
version: 1.3.5.0
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/reports-scheduler-test-and-build-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Test and Build Reports Scheduler
33
on: [push, pull_request]
44

55
env:
6-
OPENSEARCH_VERSION: '1.3.4-SNAPSHOT'
6+
OPENSEARCH_VERSION: '1.3.5-SNAPSHOT'
77

88
jobs:
99
build:

‎dashboards-reports/opensearch_dashboards.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "reportsDashboards",
3-
"version": "1.3.4.0",
4-
"opensearchDashboardsVersion": "1.3.4",
3+
"version": "1.3.5.0",
4+
"opensearchDashboardsVersion": "1.3.5",
55
"requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"],
66
"optionalPlugins": ["share"],
77
"server": true,

‎dashboards-reports/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "reports-dashboards",
3-
"version": "1.3.4.0",
3+
"version": "1.3.5.0",
44
"description": "OpenSearch Dashboards Reports Plugin",
55
"license": "Apache-2.0",
66
"main": "index.ts",

‎reports-scheduler/build.gradle‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
1010
buildscript {
1111
ext {
1212
opensearch_group = "org.opensearch"
13-
opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT")
13+
opensearch_version = System.getProperty("opensearch.version", "1.3.5-SNAPSHOT")
1414
// 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT
1515
opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
1616
common_utils_version = System.getProperty("common_utils.version", opensearch_build)
@@ -524,3 +524,21 @@ if (!usingRemoteCluster && !usingMultiNode) {
524524
}
525525

526526
apply from: 'build-tools/pkgbuild.gradle'
527+
528+
// updateVersion: Task to auto increment to the next development iteration
529+
task updateVersion {
530+
onlyIf { System.getProperty('newVersion') }
531+
doLast {
532+
ext.newVersion = System.getProperty('newVersion')
533+
println "Setting version to ${newVersion}."
534+
// String tokenization to support -SNAPSHOT
535+
ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)
536+
ant.replaceregexp(file:'../.github/workflows/dashboards-reports-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)
537+
ant.replaceregexp(file:'../.github/workflows/draft-release-notes-workflow.yml', match:'version: \\d+.\\d+.\\d+.\\d+', replace:'version: ' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true)
538+
// Match key version in JSON files.
539+
ant.replaceregexp(file:'../dashboards-reports/opensearch_dashboards.json', match:'"version": "\\d+.\\d+.\\d+.\\d+', replace:'"version": ' + '"' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true)
540+
ant.replaceregexp(file:'../dashboards-reports/package.json', match:'"version": "\\d+.\\d+.\\d+.\\d+', replace:'"version": ' + '"' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true)
541+
// Match key opensearchDashboardsVersion in JSON files.
542+
ant.replaceregexp(file:'../dashboards-reports/opensearch_dashboards.json', match:'"opensearchDashboardsVersion": "\\d+.\\d+.\\d+', replace:'"opensearchDashboardsVersion": ' + '"' + newVersion.tokenize('-')[0], flags:'g', byline:true)
543+
}
544+
}

‎reports-scheduler/src/test/resources/bwc/job-scheduler/1.3.4.0-SNAPSHOT/opensearch-job-scheduler-1.3.4.0-SNAPSHOT.zip‎

-1.13 MB
Binary file not shown.

‎reports-scheduler/src/test/resources/bwc/job-scheduler/1.3.5.0-SNAPSHOT/opensearch-job-scheduler-1.3.5.0-SNAPSHOT.zip‎

1.13 MB
Binary file not shown.

‎reports-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.3.4.0-SNAPSHOT.zip‎

-1.13 MB
Binary file not shown.

‎reports-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.3.5.0-SNAPSHOT.zip‎

1.13 MB
Binary file not shown.

0 commit comments

Comments
 (0)