Skip to content

GEODE-10467: Roll develop to 2.1.0 #7962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JinwooHwang wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

GEODE-10467: Roll develop to 2.1.0 #7962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e326d9
GEODE-10467: Roll develop to 2.1.0
JinwooHwang Nov 30, 2025
387fe5f
Remove whitespace pollution from expected-pom.xml files
JinwooHwang Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/pipelines/shared/jinja.variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ java_test_versions:
version: 17

metadata:
initial_version: 1.16.0-((semver-prerelease-token)).0
initial_version: 2.1.0-((semver-prerelease-token)).0
mass_test_run_iterations: 100

publish_artifacts:
Expand Down
10 changes: 5 additions & 5 deletions geode-book/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ public_host: localhost
sections:
- repository:
name: geode-docs
directory: docs/guide/115
directory: docs/guide/21
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: '2.1'
product_version_nodot: '21'
product_version_old_minor: '2.0'
product_version_geode: '2.1'
min_java_version: '8'
min_java_update: '121'
support_url: http://geode.apache.org/community
Expand Down
4 changes: 2 additions & 2 deletions geode-book/redirects.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/116/about_geode.html'
rewrite '/index.html', '/docs/guide/116/about_geode.html'
rewrite '/', '/docs/guide/21/about_geode.html'
rewrite '/index.html', '/docs/guide/21/about_geode.html'
11 changes: 9 additions & 2 deletions geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class KnownVersion extends AbstractVersion {
private final byte patch;
private final boolean modifiesClientServerProtocol;

public static final int HIGHEST_VERSION = 160;
public static final int HIGHEST_VERSION = 170;

@Immutable
private static final KnownVersion[] VALUES = new KnownVersion[HIGHEST_VERSION + 1];
Expand Down Expand Up @@ -216,6 +216,13 @@ public class KnownVersion extends AbstractVersion {
new KnownVersion("GEODE", "1.16.0", (byte) 1, (byte) 16, (byte) 0, (byte) 0,
GEODE_1_16_0_ORDINAL);

private static final short GEODE_2_1_0_ORDINAL = 170;

@Immutable
public static final KnownVersion GEODE_2_1_0 =
new KnownVersion("GEODE", "2.1.0", (byte) 2, (byte) 1, (byte) 0, (byte) 0,
GEODE_2_1_0_ORDINAL);

/* NOTE: when adding a new version bump the ordinal by 10. Ordinals can be short ints */

/**
Expand All @@ -229,7 +236,7 @@ public class KnownVersion extends AbstractVersion {
* HIGHEST_VERSION when changing CURRENT !!!
*/
@Immutable
public static final KnownVersion CURRENT = GEODE_1_16_0;
public static final KnownVersion CURRENT = GEODE_2_1_0;

/**
* A lot of versioning code needs access to the current version's ordinal
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# <blank> - release
#
# The full version string consists of 'versionNumber + releaseQualifier + releaseType'
version = 1.16.0-build.0
version = 2.1.0-build.0

# Default Maven targets
mavenSnapshotUrl = gcs://maven.apachegeode-ci.info/snapshots
Expand Down
Loading