From 0f0c3b15bbbf734ec0d6110104d4a2455061f87f Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 24 Apr 2024 12:59:16 -0700 Subject: [PATCH] Internal version changes PiperOrigin-RevId: 627823713 --- java/core/src/main/java/com/google/protobuf/RuntimeVersion.java | 1 - .../src/test/java/com/google/protobuf/RuntimeVersionTest.java | 2 ++ python/google/protobuf/internal/runtime_version_test.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java index 5a5170641785..29cc04a35fd4 100644 --- a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java +++ b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java @@ -38,7 +38,6 @@ public enum RuntimeDomain { public static final String SUFFIX = OSS_SUFFIX; private static final String VERSION_STRING = versionString(MAJOR, MINOR, PATCH, SUFFIX); - private static final Logger logger = Logger.getLogger(RuntimeVersion.class.getName()); /** * Validates that the gencode version is compatible with this runtime version according to diff --git a/java/core/src/test/java/com/google/protobuf/RuntimeVersionTest.java b/java/core/src/test/java/com/google/protobuf/RuntimeVersionTest.java index ce28f9eea09b..3cd3fd8bca4b 100644 --- a/java/core/src/test/java/com/google/protobuf/RuntimeVersionTest.java +++ b/java/core/src/test/java/com/google/protobuf/RuntimeVersionTest.java @@ -8,8 +8,10 @@ package com.google.protobuf; import static com.google.common.truth.Truth.assertThat; +import static java.util.logging.Level.WARNING; import static org.junit.Assert.assertThrows; +import java.util.logging.Logger; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/python/google/protobuf/internal/runtime_version_test.py b/python/google/protobuf/internal/runtime_version_test.py index 8608bd262634..a98e08e39833 100644 --- a/python/google/protobuf/internal/runtime_version_test.py +++ b/python/google/protobuf/internal/runtime_version_test.py @@ -65,6 +65,7 @@ def test_same_version_allowed(self): ) def test_newer_runtime_version_allowed(self): + runtime_version.ValidateProtobufRuntimeVersion( runtime_version.DOMAIN, runtime_version.MAJOR,