Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import com.google.protobuf.Option;
import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.slf4j.Logger;
Expand All @@ -56,6 +57,7 @@ class Slf4jUtilsTest {

// This test should only run GOOGLE_SDK_JAVA_LOGGING != true
@Test
@Disabled("See https://github.com/googleapis/google-cloud-java/issues/12836")
Comment thread
chingor13 marked this conversation as resolved.
void testGetLogger_loggingDisabled_shouldGetNOPLogger() {
Logger logger = Slf4jUtils.getLogger(Slf4jUtilsTest.class);
assertEquals(NOPLogger.class, logger.getClass());
Expand Down
14 changes: 3 additions & 11 deletions settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
https://maven.apache.org/xsd/settings-1.0.0.xsd">
<mirrors>
<mirror>
<!-- Google's Maven Central mirror for Americas
https://maven-central.storage.googleapis.com/index.html
-->
<id>google-maven-central</id>
<name>GCS Maven Central mirror</name>
<url>https://maven-central.storage-download.googleapis.com/maven2/</url>
<mirrorOf>central</mirrorOf>
</mirror>
</mirrors>
<!-- This file contains settings used by .kokoro/build.sh. These are global
Comment thread
chingor13 marked this conversation as resolved.
configs used by almost every build script.
-->
</settings>
Loading