Skip to content

Commit 11bebcf

Browse files
authored
ci: fix dependency-compatibility check (#12837)
Fixes #12828 test: disable getNOPLogger test
1 parent 64e7c9e commit 11bebcf

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/logging/Slf4jUtilsTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import com.google.protobuf.Option;
4747
import java.util.HashMap;
4848
import java.util.Map;
49+
import org.junit.jupiter.api.Disabled;
4950
import org.junit.jupiter.api.Test;
5051
import org.mockito.Mockito;
5152
import org.slf4j.Logger;
@@ -56,6 +57,7 @@ class Slf4jUtilsTest {
5657

5758
// This test should only run GOOGLE_SDK_JAVA_LOGGING != true
5859
@Test
60+
@Disabled("See https://github.com/googleapis/google-cloud-java/issues/12836")
5961
void testGetLogger_loggingDisabled_shouldGetNOPLogger() {
6062
Logger logger = Slf4jUtils.getLogger(Slf4jUtilsTest.class);
6163
assertEquals(NOPLogger.class, logger.getClass());

settings.xml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,7 @@
1818
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1919
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
2020
https://maven.apache.org/xsd/settings-1.0.0.xsd">
21-
<mirrors>
22-
<mirror>
23-
<!-- Google's Maven Central mirror for Americas
24-
https://maven-central.storage.googleapis.com/index.html
25-
-->
26-
<id>google-maven-central</id>
27-
<name>GCS Maven Central mirror</name>
28-
<url>https://maven-central.storage-download.googleapis.com/maven2/</url>
29-
<mirrorOf>central</mirrorOf>
30-
</mirror>
31-
</mirrors>
21+
<!-- This file contains settings used by .kokoro/build.sh. These are global
22+
configs used by almost every build script.
23+
-->
3224
</settings>

0 commit comments

Comments
 (0)