This is an automated email from the ASF dual-hosted git repository. roryqi pushed a commit to branch revert-9939-issue_9482 in repository https://gitbox.apache.org/repos/asf/gravitino.git
commit a96e3b7bedae3265481d4ebf2ad2e44832b06899 Author: roryqi <[email protected]> AuthorDate: Thu Feb 26 16:40:18 2026 +0800 Revert "[#9482] improvement(common): Enhance version parsing to support relea…" This reverts commit aa4043d646f335852397088497b5d9b8829cc075. --- .../main/java/org/apache/gravitino/Version.java | 2 +- .../java/org/apache/gravitino/TestVersion.java | 56 ---------------------- 2 files changed, 1 insertion(+), 57 deletions(-) diff --git a/common/src/main/java/org/apache/gravitino/Version.java b/common/src/main/java/org/apache/gravitino/Version.java index 64eb3c49bc..b4183b10ed 100644 --- a/common/src/main/java/org/apache/gravitino/Version.java +++ b/common/src/main/java/org/apache/gravitino/Version.java @@ -36,7 +36,7 @@ public class Version { private static final int VERSION_PART_NUMBER = 3; private static final Pattern PATTERN = - Pattern.compile("^(\\d+)\\.(\\d+)\\.(\\d+)(?:rc(\\d{1,9})|-.*|\\.([a-zA-Z].*))?$"); + Pattern.compile("^(\\d+)\\.(\\d+)\\.(\\d+)(?:-.*|\\.([a-zA-Z].*))?$"); private static final Version INSTANCE = new Version(); diff --git a/common/src/test/java/org/apache/gravitino/TestVersion.java b/common/src/test/java/org/apache/gravitino/TestVersion.java deleted file mode 100644 index 9cadb9b814..0000000000 --- a/common/src/test/java/org/apache/gravitino/TestVersion.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.gravitino; - -import org.apache.gravitino.exceptions.GravitinoRuntimeException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -public class TestVersion { - - @Test - public void testParseReleaseCandidateVersions() { - Assertions.assertArrayEquals(new int[] {1, 1, 0}, Version.parseVersionNumber("1.1.0rc0")); - Assertions.assertArrayEquals(new int[] {1, 1, 0}, Version.parseVersionNumber("1.1.0rc1")); - Assertions.assertArrayEquals(new int[] {1, 1, 0}, Version.parseVersionNumber("1.1.0rc1000")); - } - - @Test - public void testParseReleaseCandidateOutOfRange() { - Assertions.assertDoesNotThrow(() -> Version.parseVersionNumber("1.1.0rc1001")); - Assertions.assertThrowsExactly( - GravitinoRuntimeException.class, () -> Version.parseVersionNumber("1.1.0rc")); - Assertions.assertThrowsExactly( - GravitinoRuntimeException.class, () -> Version.parseVersionNumber("1.1.0rc-1")); - } - - @Test - public void testParseSnapshotVersion() { - Assertions.assertArrayEquals(new int[] {1, 1, 0}, Version.parseVersionNumber("1.1.0-SNAPSHOT")); - Assertions.assertArrayEquals(new int[] {2, 0, 1}, Version.parseVersionNumber("2.0.1-beta")); - Assertions.assertArrayEquals(new int[] {3, 2, 4}, Version.parseVersionNumber("3.2.4-foo.bar")); - } - - @Test - public void testParseAlphaVersion() { - Assertions.assertArrayEquals(new int[] {1, 1, 0}, Version.parseVersionNumber("1.1.0.alpha")); - Assertions.assertArrayEquals(new int[] {0, 9, 9}, Version.parseVersionNumber("0.9.9.alpha1")); - } -}
