Skip to content

Commit f611c74

Browse files
committed
feedback: added comments, move slf4j dep to each module inside gax.
1 parent d86b7a0 commit f611c74

File tree

6 files changed

+22
-9
lines changed

6 files changed

+22
-9
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ jobs:
259259
--batch-mode \
260260
--no-transfer-progress
261261
# The `slf4j2_logback` profile brings logging dependency and compiles logging tests, require env var to be set
262-
- name: Showcase integration tests - Logging 2x
262+
- name: Showcase integration tests - Logging SLF4J 2.x
263263
working-directory: showcase
264264
run: |
265265
mvn clean verify -P '!showcase,enable-integration-tests,loggingTestBase,slf4j2_logback' \
@@ -269,7 +269,7 @@ jobs:
269269
env:
270270
GOOGLE_SDK_JAVA_LOGGING: true
271271
# The `slf4j1_logback` profile brings logging dependency and compiles logging tests, require env var to be set
272-
- name: Showcase integration tests - Logging 1x
272+
- name: Showcase integration tests - Logging SLF4J 1.x
273273
working-directory: showcase
274274
run: |
275275
mvn clean verify -P '!showcase,enable-integration-tests,loggingTestBase,slf4j1_logback' \

gax-java/gax-grpc/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@
9292
<artifactId>auto-value-annotations</artifactId>
9393
<scope>provided</scope>
9494
</dependency>
95+
<!-- Logging dependency -->
96+
<dependency>
97+
<groupId>org.slf4j</groupId>
98+
<artifactId>slf4j-api</artifactId>
99+
<optional>true</optional>
100+
</dependency>
95101

96102
<!-- test dependencies -->
97103
<dependency>

gax-java/gax-httpjson/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@
7878
<artifactId>auto-value-annotations</artifactId>
7979
<scope>provided</scope>
8080
</dependency>
81+
<!-- Logging dependency -->
82+
<dependency>
83+
<groupId>org.slf4j</groupId>
84+
<artifactId>slf4j-api</artifactId>
85+
<optional>true</optional>
86+
</dependency>
8187

8288
<!-- test dependencies -->
8389
<dependency>

gax-java/gax/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@
7373
<artifactId>opentelemetry-api</artifactId>
7474
<optional>true</optional>
7575
</dependency>
76+
<!-- Logging dependency -->
77+
<dependency>
78+
<groupId>org.slf4j</groupId>
79+
<artifactId>slf4j-api</artifactId>
80+
<optional>true</optional>
81+
</dependency>
7682
</dependencies>
7783

7884
<build>

gax-java/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,6 @@
172172

173173

174174
<dependencies>
175-
<!-- Logging dependency -->
176-
<dependency>
177-
<groupId>org.slf4j</groupId>
178-
<artifactId>slf4j-api</artifactId>
179-
<optional>true</optional>
180-
</dependency>
181175
<!-- Test Dependencies -->
182176
<dependency>
183177
<groupId>org.junit.jupiter</groupId>

showcase/gapic-showcase/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,8 @@
310310
</profile>
311311
<profile>
312312
<id>disabledLogging</id>
313-
<!-- Only compile test to run when GOOGLE_SDK_JAVA_LOGGING=!true -->
313+
<!-- Only compile test to run when GOOGLE_SDK_JAVA_LOGGING=!true -->
314+
<!-- To verify logging correctly turned off when logging deps present -->
314315
<activation>
315316
<property>
316317
<name>disable_logging</name>

0 commit comments

Comments
 (0)