Skip to content

Commit 3dd7452

Browse files
fix(java): run Maven in plain console-friendly mode (#1301)
Source-Link: googleapis/synthtool@7956842 Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:491a007c6bd6e77f9e9b1bebcd6cdf08a4a4ef2c228c123d9696845204cb685d
1 parent e833abe commit 3dd7452

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker:
22
image: gcr.io/repo-automation-bots/owlbot-java:latest
3-
digest: sha256:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87
3+
digest: sha256:491a007c6bd6e77f9e9b1bebcd6cdf08a4a4ef2c228c123d9696845204cb685d

.kokoro/build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ set +e
4747

4848
case ${JOB_TYPE} in
4949
test)
50-
mvn test -B -Dclirr.skip=true -Denforcer.skip=true
50+
mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true
5151
RETURN_CODE=$?
5252
;;
5353
lint)
54-
mvn com.coveo:fmt-maven-plugin:check
54+
mvn com.coveo:fmt-maven-plugin:check -B -ntp
5555
RETURN_CODE=$?
5656
;;
5757
javadoc)
58-
mvn javadoc:javadoc javadoc:test-javadoc
58+
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
5959
RETURN_CODE=$?
6060
;;
6161
integration)
@@ -71,7 +71,7 @@ integration)
7171
;;
7272
graalvm)
7373
# Run Unit and Integration Tests with Native Image
74-
mvn -ntp -Pnative -Penable-integration-tests test
74+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
7575
RETURN_CODE=$?
7676
;;
7777
samples)
@@ -104,7 +104,7 @@ samples)
104104
fi
105105
;;
106106
clirr)
107-
mvn -B -Denforcer.skip=true clirr:check
107+
mvn -B -ntp -Denforcer.skip=true clirr:check
108108
RETURN_CODE=$?
109109
;;
110110
*)

google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ public class HttpRequestTracingTest {
4444
public void setupTestTracer() {
4545
Tracing.getExportComponent().getSpanExporter().registerHandler("test", testHandler);
4646
TraceParams params =
47-
Tracing.getTraceConfig().getActiveTraceParams().toBuilder()
47+
Tracing.getTraceConfig()
48+
.getActiveTraceParams()
49+
.toBuilder()
4850
.setSampler(Samplers.alwaysSample())
4951
.build();
5052
Tracing.getTraceConfig().updateActiveTraceParams(params);

0 commit comments

Comments
 (0)