Skip to content

Commit 23b7f44

Browse files
committed
cleanup and restore logging settings
we added lots of logging to debug CI issues with Java 11, now its time to take those back out Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
1 parent 6b5f495 commit 23b7f44

5 files changed

Lines changed: 20 additions & 25 deletions

File tree

.github/workflows/build.yml

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818
with:
1919
java-version: ${{ matrix.java }}
2020
- name: Build tools
21-
run: mvn -B install --file fhir-tools/pom.xml --no-transfer-progress
21+
run: mvn -B install --file fhir-tools/pom.xml
2222
- name: Build samples
23-
run: mvn -B install --file fhir-examples/pom.xml --no-transfer-progress
23+
run: mvn -B install --file fhir-examples/pom.xml
2424
- name: Build parent without tests
25-
run: mvn -B install --file fhir-parent/pom.xml -DskipTests --no-transfer-progress
25+
run: mvn -B install --file fhir-parent/pom.xml -DskipTests
2626
- name: Build sample generator
27-
run: mvn -B package --file fhir-examples-generator/pom.xml --no-transfer-progress
27+
run: mvn -B package --file fhir-examples-generator/pom.xml
2828
- name: Build benchmark
29-
run: mvn -B package --file fhir-benchmark/pom.xml --no-transfer-progress
29+
run: mvn -B package --file fhir-benchmark/pom.xml
3030
build:
3131
runs-on: ubuntu-latest
3232
strategy:
@@ -39,9 +39,9 @@ jobs:
3939
with:
4040
java-version: ${{ matrix.java }}
4141
- name: Build samples
42-
run: mvn -B install --file fhir-examples/pom.xml --no-transfer-progress
42+
run: mvn -B install --file fhir-examples/pom.xml
4343
- name: Build parent with tests
44-
run: mvn -B -T2C package --file fhir-parent/pom.xml --no-transfer-progress
44+
run: mvn -B -T2C package --file fhir-parent/pom.xml
4545
e2e-java8:
4646
runs-on: ubuntu-latest
4747
steps:
@@ -55,20 +55,18 @@ jobs:
5555
java-version: 8
5656
architecture: x64
5757
jdkFile: OpenJDK8U-jdk_x64_linux_openj9_8u232b09_openj9-0.17.0.tar.gz
58-
- name: Print env vars
59-
run: env
6058
- name: Build samples
61-
run: mvn install --file fhir-examples/pom.xml --no-transfer-progress
59+
run: mvn -B install --file fhir-examples/pom.xml
6260
- name: Build parent without tests
63-
run: mvn install --file fhir-parent/pom.xml -DskipTests --no-transfer-progress
61+
run: mvn -B install --file fhir-parent/pom.xml -DskipTests
6462
- name: Server Integration Tests
6563
env:
6664
LC_ALL: en_US.UTF-8
6765
run: |
6866
export WORKSPACE=${GITHUB_WORKSPACE}
6967
build/pre-integration-test.sh
7068
env
71-
mvn test -DskipTests=false -f fhir-server-test/pom.xml -DskipWebSocketTest=true --no-transfer-progress
69+
mvn -B test -DskipTests=false -f fhir-server-test/pom.xml -DskipWebSocketTest=true
7270
build/post-integration-test.sh
7371
- name: Gather error logs
7472
if: failure()
@@ -100,20 +98,18 @@ jobs:
10098
java-version: 11
10199
architecture: x64
102100
jdkFile: OpenJDK11U-jdk_x64_linux_openj9_2019-10-16-10-43.tar.gz
103-
- name: Print env vars
104-
run: env
105101
- name: Build samples
106-
run: mvn install --file fhir-examples/pom.xml --no-transfer-progress
102+
run: mvn -B install --file fhir-examples/pom.xml
107103
- name: Build parent without tests
108-
run: mvn install --file fhir-parent/pom.xml -DskipTests --no-transfer-progress
104+
run: mvn -B install --file fhir-parent/pom.xml -DskipTests
109105
- name: Server Integration Tests
110106
env:
111107
LC_ALL: en_US.UTF-8
112108
run: |
113109
export WORKSPACE=${GITHUB_WORKSPACE}
114110
build/pre-integration-test.sh
115111
env
116-
mvn test -DskipTests=false -f fhir-server-test/pom.xml -DskipWebSocketTest=true --no-transfer-progress
112+
mvn -B test -DskipTests=false -f fhir-server-test/pom.xml -DskipWebSocketTest=true
117113
build/post-integration-test.sh
118114
- name: Gather error logs
119115
if: failure()
@@ -147,14 +143,14 @@ jobs:
147143
with:
148144
java-version: ${{ matrix.java }}
149145
- name: Build samples
150-
run: mvn -B install --file fhir-examples/pom.xml --no-transfer-progress
146+
run: mvn -B install --file fhir-examples/pom.xml
151147
- name: Build parent without tests
152-
run: mvn -B install --file fhir-parent/pom.xml -DskipTests --no-transfer-progress
148+
run: mvn -B install --file fhir-parent/pom.xml -DskipTests
153149
- name: Server Integration Tests
154150
run: |
155151
export WORKSPACE=${GITHUB_WORKSPACE}
156152
build/pre-integration-test.sh
157-
mvn -B test -DskipTests=false -f fhir-server-test/pom.xml -DskipWebSocketTest=true --no-transfer-progress
153+
mvn -B test -DskipTests=false -f fhir-server-test/pom.xml -DskipWebSocketTest=true
158154
build/post-integration-test.sh
159155
- name: Gather error logs
160156
if: failure()

fhir-parent/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -876,14 +876,14 @@
876876
</repository>
877877
</distributionManagement>
878878
</profile>
879-
<!-- <profile>
879+
<profile>
880880
<id>switch-jdk-11</id>
881881
<activation>
882882
<jdk>!1.8</jdk>
883883
</activation>
884884
<properties>
885885
<java.version>11</java.version>
886886
</properties>
887-
</profile> -->
887+
</profile>
888888
</profiles>
889889
</project>

fhir-persistence/src/test/resources/logging.unitTest.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
4949
############################################################
5050

5151
# Set this to FINE or higher to output the SQL statements and related debug info
52-
com.ibm.fhir.persistence.level = FINE
52+
com.ibm.fhir.persistence.level = INFO

fhir-server-test/src/test/resources/test.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ test.websocket.url = wss://localhost:9443/fhir-server/api/v4/notification
2929
test.kafka.connectionInfo = localhost:9092
3030
test.kafka.topicName = fhirNotifications
3131

32-
fhirclient.logging.enabled = true
32+
fhirclient.logging.enabled = false
3333

3434
fhirclient.hostnameVerification.enabled = false
3535
fhirclient.http.receive.timeout = 60000

fhir-server/liberty-config/server.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
<logging traceSpecification="*=info" traceFormat="BASIC"/>
109109
<logging traceSpecification="*=info:com.ibm.fhir.*=finer" traceFormat="BASIC"/>
110110
-->
111-
<logging traceSpecification="*=info:com.ibm.fhir.*=finer" traceFormat="BASIC"/>
112111

113112
<!-- Automatically expand WAR files and EAR files -->
114113
<applicationManager autoExpand="true"/>

0 commit comments

Comments
 (0)