From 352f1d7f3a4579ba0cd28cf216a059ed345a5104 Mon Sep 17 00:00:00 2001 From: Owen Nichols <34043438+onichols-pivotal@users.noreply.github.com> Date: Mon, 9 May 2022 09:17:26 -0700 Subject: [PATCH] GEODE-10089: Roll develop to 1.16.0 (#7668) Now that support/1.15 has been created, develop advances. --- ci/pipelines/images/jinja.template.yml | 1 + ci/pipelines/meta/deploy_meta.sh | 2 +- ci/pipelines/shared/jinja.variables.yml | 2 +- dev-tools/release/create_support_branches.sh | 4 +++- geode-book/config.yml | 10 +++++----- geode-book/redirects.rb | 4 ++-- .../geode/internal/serialization/KnownVersion.java | 11 +++++++++-- gradle.properties | 2 +- 8 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml index 219cb6b1c6e7..f592847576db 100644 --- a/ci/pipelines/images/jinja.template.yml +++ b/ci/pipelines/images/jinja.template.yml @@ -234,6 +234,7 @@ jobs: - get: alpine-tools-docker-image passed: [build-alpine-tools-docker-image] - get: github-pr-resource-dockerfile + trigger: true - put: github-pr-resource-image params: build: github-pr-resource-dockerfile diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh index 5befc2a29083..23b600916179 100755 --- a/ci/pipelines/meta/deploy_meta.sh +++ b/ci/pipelines/meta/deploy_meta.sh @@ -300,9 +300,9 @@ if [[ "$GEODE_FORK" == "${UPSTREAM_FORK}" ]]; then if [[ "${PUBLIC}" == "true" ]]; then exposePipelines ${PIPELINE_PREFIX}main ${PIPELINE_PREFIX}images enableFeature examples + enableFeature pr fi if [[ "$GEODE_BRANCH" == "develop" ]]; then - enableFeature pr enableFeature mass-test-run fi fi diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml index f5d96d3cdfd0..cc06c3fd018e 100644 --- a/ci/pipelines/shared/jinja.variables.yml +++ b/ci/pipelines/shared/jinja.variables.yml @@ -76,7 +76,7 @@ java_test_versions: version: 17 metadata: - initial_version: 1.15.0-((semver-prerelease-token)).0 + initial_version: 1.16.0-((semver-prerelease-token)).0 mass_test_run_iterations: 100 publish_artifacts: diff --git a/dev-tools/release/create_support_branches.sh b/dev-tools/release/create_support_branches.sh index 68f9579a0d38..c13e4111012d 100755 --- a/dev-tools/release/create_support_branches.sh +++ b/dev-tools/release/create_support_branches.sh @@ -197,7 +197,9 @@ git diff --staged --color | cat ./gradlew updateExpectedPom -git commit -a -m "roll develop to ${NEWVERSION} now that support/${VERSION_MM} has been created" +git commit -a -m "$JIRA: Roll develop to ${NEWVERSION} + +Now that support/${VERSION_MM} has been created, develop advances." git push -u myfork set +x diff --git a/geode-book/config.yml b/geode-book/config.yml index 16547b0cb888..28cda59fd94f 100644 --- a/geode-book/config.yml +++ b/geode-book/config.yml @@ -21,17 +21,17 @@ public_host: localhost sections: - repository: name: geode-docs - directory: docs/guide/115 + directory: docs/guide/116 subnav_template: geode-subnav template_variables: product_name_long: Apache Geode product_name: Geode product_name_lowercase: geode - product_version: '1.15' - product_version_nodot: '115' - product_version_old_minor: '1.14' - product_version_geode: '1.15' + product_version: '1.16' + product_version_nodot: '116' + product_version_old_minor: '1.15' + product_version_geode: '1.16' min_java_version: '8' min_java_update: '121' support_url: http://geode.apache.org/community diff --git a/geode-book/redirects.rb b/geode-book/redirects.rb index 5932007603c0..54079e7ea54f 100644 --- a/geode-book/redirects.rb +++ b/geode-book/redirects.rb @@ -14,5 +14,5 @@ #permissions and limitations under the License. r301 %r{/releases/latest/javadoc/(.*)}, 'http://geode.apache.org/releases/latest/javadoc/$1' -rewrite '/', '/docs/guide/115/about_geode.html' -rewrite '/index.html', '/docs/guide/115/about_geode.html' +rewrite '/', '/docs/guide/116/about_geode.html' +rewrite '/index.html', '/docs/guide/116/about_geode.html' diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java index d717ec2d0fce..935a749a87f9 100644 --- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java +++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java @@ -48,7 +48,7 @@ public class KnownVersion extends AbstractVersion { private final byte patch; private final boolean modifiesClientServerProtocol; - public static final int HIGHEST_VERSION = 150; + public static final int HIGHEST_VERSION = 160; @Immutable private static final KnownVersion[] VALUES = new KnownVersion[HIGHEST_VERSION + 1]; @@ -209,6 +209,13 @@ public class KnownVersion extends AbstractVersion { new KnownVersion("GEODE", "1.15.0", (byte) 1, (byte) 15, (byte) 0, (byte) 0, GEODE_1_15_0_ORDINAL, true); + private static final short GEODE_1_16_0_ORDINAL = 160; + + @Immutable + public static final KnownVersion GEODE_1_16_0 = + new KnownVersion("GEODE", "1.16.0", (byte) 1, (byte) 16, (byte) 0, (byte) 0, + GEODE_1_16_0_ORDINAL); + /* NOTE: when adding a new version bump the ordinal by 10. Ordinals can be short ints */ /** @@ -222,7 +229,7 @@ public class KnownVersion extends AbstractVersion { * HIGHEST_VERSION when changing CURRENT !!! */ @Immutable - public static final KnownVersion CURRENT = GEODE_1_15_0; + public static final KnownVersion CURRENT = GEODE_1_16_0; /** * A lot of versioning code needs access to the current version's ordinal diff --git a/gradle.properties b/gradle.properties index bbf7c8efd17a..fae62013714e 100755 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ # - release # # The full version string consists of 'versionNumber + releaseQualifier + releaseType' -version = 1.15.0-build.0 +version = 1.16.0-build.0 # Default Maven targets mavenSnapshotUrl = gcs://maven.apachegeode-ci.info/snapshots