This is an automated email from the ASF dual-hosted git repository.
snuyanzin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-hbase.git
The following commit(s) were added to refs/heads/main by this push:
new 2d71075 [hotfix] Backport Jetty's fix for java version parsing
2d71075 is described below
commit 2d71075efc865d9e8d43c09a62cc980b205ac209
Author: Sergey Nuyanzin <snuyan...@gmail.com>
AuthorDate: Wed Oct 11 20:46:24 2023 +0200
[hotfix] Backport Jetty's fix for java version parsing
---
.../java/org/eclipse/jetty/util/JavaVersion.java | 153 +++++++++++++++++++++
1 file changed, 153 insertions(+)
diff --git
a/flink-connector-hbase-2.2/src/test/java/org/eclipse/jetty/util/JavaVersion.java
b/flink-connector-hbase-2.2/src/test/java/org/eclipse/jetty/util/JavaVersion.java
new file mode 100644
index 0000000..5d6842b
--- /dev/null
+++
b/flink-connector-hbase-2.2/src/test/java/org/eclipse/jetty/util/JavaVersion.java
@@ -0,0 +1,153 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+//
+// The Eclipse Public License is available at
+// http://www.eclipse.org/legal/epl-v10.html
+//
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+//
+// You may elect to redistribute this code under either of these licenses.
+// ========================================================================
+//
+
+package org.eclipse.jetty.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Java Version Utility class.
+ *
+ * <p>Parses java versions to extract a consistent set of version parts
+ */
+public class JavaVersion {
+ /**
+ * Context attribute that can be set to target a different version of the
jvm than the current
+ * runtime. Acceptable values should correspond to those returned by
JavaVersion.getPlatform().
+ */
+ public static final String JAVA_TARGET_PLATFORM =
"org.eclipse.jetty.javaTargetPlatform";
+
+ /** Regex for Java version numbers. */
+ private static final String VSTR_FORMAT =
"(?<VNUM>[1-9][0-9]*(?:(?:\\.0)*\\.[0-9]+)*).*";
+
+ static final Pattern VSTR_PATTERN = Pattern.compile(VSTR_FORMAT);
+
+ public static final JavaVersion VERSION =
+ parse(
+ System.getProperty(
+ "java.runtime.version",
System.getProperty("java.version", "1.8")));
+
+ public static JavaVersion parse(String v) {
+ Matcher m = VSTR_PATTERN.matcher(v);
+ if (!m.matches() || m.group("VNUM") == null) {
+ System.err.println("ERROR: Invalid version string: '" + v + "'");
+ return new JavaVersion(v + "-UNKNOWN", 8, 1, 8, 0);
+ }
+
+ // $VNUM is a dot-separated list of integers of arbitrary length
+ String[] split = m.group("VNUM").split("\\.");
+ int[] version = new int[split.length];
+ for (int i = 0; i < split.length; i++) {
+ version[i] = Integer.parseInt(split[i]);
+ }
+
+ return new JavaVersion(
+ v,
+ (version[0] >= 9 || version.length == 1) ? version[0] :
version[1],
+ version[0],
+ version.length > 1 ? version[1] : 0,
+ version.length > 2 ? version[2] : 0);
+ }
+
+ private final String version;
+ private final int platform;
+ private final int major;
+ private final int minor;
+ private final int micro;
+
+ private JavaVersion(String version, int platform, int major, int minor,
int micro) {
+ this.version = version;
+ this.platform = platform;
+ this.major = major;
+ this.minor = minor;
+ this.micro = micro;
+ }
+
+ /** @return the string from which this JavaVersion was created */
+ public String getVersion() {
+ return version;
+ }
+
+ /**
+ * Returns the Java Platform version, such as {@code 8} for JDK 1.8.0_92
and {@code 9} for JDK
+ * 9.2.4.
+ *
+ * @return the Java Platform version
+ */
+ public int getPlatform() {
+ return platform;
+ }
+
+ /**
+ * Returns the major number version, such as {@code 1} for JDK 1.8.0_92
and {@code 9} for JDK
+ * 9.2.4.
+ *
+ * @return the major number version
+ */
+ public int getMajor() {
+ return major;
+ }
+
+ /**
+ * Returns the minor number version, such as {@code 8} for JDK 1.8.0_92
and {@code 2} for JDK
+ * 9.2.4.
+ *
+ * @return the minor number version
+ */
+ public int getMinor() {
+ return minor;
+ }
+
+ /**
+ * Returns the micro number version (aka security number), such as {@code
0} for JDK 1.8.0_92
+ * and {@code 4} for JDK 9.2.4.
+ *
+ * @return the micro number version
+ */
+ public int getMicro() {
+ return micro;
+ }
+
+ /**
+ * Returns the update number version, such as {@code 92} for JDK 1.8.0_92
and {@code 0} for JDK
+ * 9.2.4.
+ *
+ * @return the update number version
+ */
+ @Deprecated
+ public int getUpdate() {
+ return 0;
+ }
+
+ /**
+ * Returns the remaining string after the version numbers, such as {@code
-internal} for JDK
+ * 1.8.0_92-internal and {@code -ea} for JDK 9-ea, or {@code +13} for JDK
9.2.4+13.
+ *
+ * @return the remaining string after the version numbers
+ */
+ @Deprecated
+ public String getSuffix() {
+ return null;
+ }
+
+ @Override
+ public String toString() {
+ return version;
+ }
+}
