This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new ea37a2d roll develop to 1.15.0 now that support/1.14 has been created
(#6033)
ea37a2d is described below
commit ea37a2d31e023aa5645c6404d1d55191e689b926
Author: Owen Nichols <[email protected]>
AuthorDate: Sun Feb 14 22:28:23 2021 -0800
roll develop to 1.15.0 now that support/1.14 has been created (#6033)
---
ci/pipelines/shared/jinja.variables.yml | 2 +-
geode-book/config.yml | 8 ++++----
geode-book/redirects.rb | 4 ++--
.../geode/internal/cache/tier/sockets/CommandInitializer.java | 2 +-
.../org/apache/geode/internal/serialization/KnownVersion.java | 11 +++++++++--
gradle.properties | 2 +-
6 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/ci/pipelines/shared/jinja.variables.yml
b/ci/pipelines/shared/jinja.variables.yml
index d9bc3aa..54a68f5 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -72,7 +72,7 @@ java_test_versions:
version: 11
metadata:
- initial_version: 1.14.0-((semver-prerelease-token)).0
+ initial_version: 1.15.0-((semver-prerelease-token)).0
mass_test_run_iterations: 100
publish_artifacts:
diff --git a/geode-book/config.yml b/geode-book/config.yml
index 3c1c5d3..ba88881 100644
--- a/geode-book/config.yml
+++ b/geode-book/config.yml
@@ -21,16 +21,16 @@ public_host: localhost
sections:
- repository:
name: geode-docs
- directory: docs/guide/114
+ directory: docs/guide/115
subnav_template: geode-subnav
template_variables:
product_name_long: Apache Geode
product_name: Geode
product_name_lowercase: geode
- product_version: '1.14'
- product_version_nodot: '114'
- product_version_geode: '1.14'
+ product_version: '1.15.0'
+ product_version_nodot: '115'
+ product_version_geode: '1.15'
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 a0b36c9..5932007 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/114/about_geode.html'
-rewrite '/index.html', '/docs/guide/114/about_geode.html'
+rewrite '/', '/docs/guide/115/about_geode.html'
+rewrite '/index.html', '/docs/guide/115/about_geode.html'
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
index 65b1757..72374e6 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -203,8 +203,8 @@ public class CommandInitializer implements CommandRegistry {
allCommands.put(KnownVersion.GEODE_1_12_1, geode18Commands);
allCommands.put(KnownVersion.GEODE_1_13_0, geode18Commands);
allCommands.put(KnownVersion.GEODE_1_13_1, geode18Commands);
-
allCommands.put(KnownVersion.GEODE_1_14_0, geode18Commands);
+ allCommands.put(KnownVersion.GEODE_1_15_0, geode18Commands);
return allCommands;
}
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 43415cd..a5ca6cf 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
@@ -47,7 +47,7 @@ public class KnownVersion extends AbstractVersion {
private final byte release;
private final byte patch;
- public static final int HIGHEST_VERSION = 125;
+ public static final int HIGHEST_VERSION = 130;
@Immutable
private static final KnownVersion[] VALUES = new
KnownVersion[HIGHEST_VERSION + 1];
@@ -247,6 +247,13 @@ public class KnownVersion extends AbstractVersion {
new KnownVersion("GEODE", "1.14.0", (byte) 1, (byte) 14, (byte) 0,
(byte) 0,
GEODE_1_14_0_ORDINAL);
+ private static final short GEODE_1_15_0_ORDINAL = 130;
+
+ @Immutable
+ public static final KnownVersion GEODE_1_15_0 =
+ new KnownVersion("GEODE", "1.15.0", (byte) 1, (byte) 15, (byte) 0,
(byte) 0,
+ GEODE_1_15_0_ORDINAL);
+
/* NOTE: when adding a new version bump the ordinal by 5. Ordinals can be
short ints */
/**
@@ -260,7 +267,7 @@ public class KnownVersion extends AbstractVersion {
* HIGHEST_VERSION when changing CURRENT !!!
*/
@Immutable
- public static final KnownVersion CURRENT = GEODE_1_14_0;
+ public static final KnownVersion CURRENT = GEODE_1_15_0;
/**
* A lot of versioning code needs access to the current version's ordinal
diff --git a/gradle.properties b/gradle.properties
index a82f968..903dfbd 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,7 @@
# <blank> - release
#
# The full version string consists of 'versionNumber + releaseQualifier +
releaseType'
-version = 1.14.0-build.0
+version = 1.15.0-build.0
# Default Maven targets
mavenSnapshotUrl = gcs://maven.apachegeode-ci.info/snapshots
