GEODE-10089: Roll develop to 1.16.0 (#7668)

Now that support/1.15 has been created, develop advances.
apache · May 9, 2022 · 352f1d7 · 352f1d7
1 parent a06e294
commit 352f1d7
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -26,7 +26,7 @@
 #   <blank>   - 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