diff --git a/components/api/src/test/resources/conf/logback/logback.xml b/components/api/src/test/resources/conf/logback/logback.xml index d1e71a9b9f..f274952974 100644 --- a/components/api/src/test/resources/conf/logback/logback.xml +++ b/components/api/src/test/resources/conf/logback/logback.xml @@ -3,11 +3,14 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + - + \ No newline at end of file diff --git a/components/client/src/test/integration/resources/logback.xml b/components/client/src/test/integration/resources/logback.xml index d6b47779a8..4af83c2831 100644 --- a/components/client/src/test/integration/resources/logback.xml +++ b/components/client/src/test/integration/resources/logback.xml @@ -3,7 +3,10 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + diff --git a/components/client/src/test/unit/resources/logback.xml b/components/client/src/test/unit/resources/logback.xml index 12b75ef1ec..9162648e1e 100644 --- a/components/client/src/test/unit/resources/logback.xml +++ b/components/client/src/test/unit/resources/logback.xml @@ -3,7 +3,9 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} diff --git a/components/common/src/test/resources/logback.xml b/components/common/src/test/resources/logback.xml index 8101ed2c15..2e0104a059 100644 --- a/components/common/src/test/resources/logback.xml +++ b/components/common/src/test/resources/logback.xml @@ -3,7 +3,10 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + diff --git a/components/proxy/src/test/resources/conf/logback.xml b/components/proxy/src/test/resources/conf/logback.xml index d1e71a9b9f..f274952974 100644 --- a/components/proxy/src/test/resources/conf/logback.xml +++ b/components/proxy/src/test/resources/conf/logback.xml @@ -3,11 +3,14 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + - + \ No newline at end of file diff --git a/components/proxy/src/test/resources/logback.xml b/components/proxy/src/test/resources/logback.xml index c1fd57d080..84d414d4b4 100644 --- a/components/proxy/src/test/resources/logback.xml +++ b/components/proxy/src/test/resources/logback.xml @@ -3,7 +3,10 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + diff --git a/components/server/src/test/resources/conf/logback/logback.xml b/components/server/src/test/resources/conf/logback/logback.xml index d1e71a9b9f..f274952974 100644 --- a/components/server/src/test/resources/conf/logback/logback.xml +++ b/components/server/src/test/resources/conf/logback/logback.xml @@ -3,11 +3,14 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + - + \ No newline at end of file diff --git a/components/server/src/test/resources/logback.xml b/components/server/src/test/resources/logback.xml index bfea2f3640..b5b7208171 100644 --- a/components/server/src/test/resources/logback.xml +++ b/components/server/src/test/resources/logback.xml @@ -3,7 +3,10 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + diff --git a/pom.xml b/pom.xml index 313bd52a6e..ebd468430a 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ 3.1.5 - 1.1.2 + 1.1.10 1.7.30 2.12 diff --git a/support/testsupport/src/test/resources/logback.xml b/support/testsupport/src/test/resources/logback.xml new file mode 100644 index 0000000000..8c38758d79 --- /dev/null +++ b/support/testsupport/src/test/resources/logback.xml @@ -0,0 +1,16 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + + + + + + + + diff --git a/system-tests/e2e-suite/src/test/resources/conf/logback/logback-debug-stdout.xml b/system-tests/e2e-suite/src/test/resources/conf/logback/logback-debug-stdout.xml index 05396f81c2..c718ed0138 100644 --- a/system-tests/e2e-suite/src/test/resources/conf/logback/logback-debug-stdout.xml +++ b/system-tests/e2e-suite/src/test/resources/conf/logback/logback-debug-stdout.xml @@ -2,7 +2,10 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + diff --git a/system-tests/e2e-suite/src/test/resources/conf/logback/logback-suppress-errors.xml b/system-tests/e2e-suite/src/test/resources/conf/logback/logback-suppress-errors.xml index 31eeba891b..c4498959b3 100644 --- a/system-tests/e2e-suite/src/test/resources/conf/logback/logback-suppress-errors.xml +++ b/system-tests/e2e-suite/src/test/resources/conf/logback/logback-suppress-errors.xml @@ -2,7 +2,10 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + diff --git a/system-tests/e2e-suite/src/test/resources/conf/logback/logback.xml b/system-tests/e2e-suite/src/test/resources/conf/logback/logback.xml index 82046222c3..9b2a801c07 100644 --- a/system-tests/e2e-suite/src/test/resources/conf/logback/logback.xml +++ b/system-tests/e2e-suite/src/test/resources/conf/logback/logback.xml @@ -2,7 +2,10 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + diff --git a/system-tests/e2e-suite/src/test/resources/logback.xml b/system-tests/e2e-suite/src/test/resources/logback.xml index 4e0b59190c..427b9b85ee 100644 --- a/system-tests/e2e-suite/src/test/resources/logback.xml +++ b/system-tests/e2e-suite/src/test/resources/logback.xml @@ -3,7 +3,10 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + diff --git a/system-tests/ft-suite/src/test/resources/conf/logback/logback.xml b/system-tests/ft-suite/src/test/resources/conf/logback/logback.xml index 7762cee65f..7614cd2463 100644 --- a/system-tests/ft-suite/src/test/resources/conf/logback/logback.xml +++ b/system-tests/ft-suite/src/test/resources/conf/logback/logback.xml @@ -2,7 +2,10 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + diff --git a/system-tests/ft-suite/src/test/resources/logback.xml b/system-tests/ft-suite/src/test/resources/logback.xml index 9e521b9a4d..3da1ed6450 100644 --- a/system-tests/ft-suite/src/test/resources/logback.xml +++ b/system-tests/ft-suite/src/test/resources/logback.xml @@ -3,7 +3,10 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%ex{full, + org.junit, + org.apache.maven.surefire} + diff --git a/travis/deploy.sh b/travis/deploy.sh index 7bada4483f..c81339a7e2 100755 --- a/travis/deploy.sh +++ b/travis/deploy.sh @@ -48,7 +48,7 @@ mvn install -B -U -P macosx,release -DskipTests=true -Dmaven.test.skip=true -Dgp function deploySnapshot() { echo "Deploying snapshot to sonatype" - mvn deploy --settings travis/mvn-settings.xml -B -U -P sonatype-oss-release,linux -DskipTests=true -Dmaven.test.skip=true -Dgpg.skip=true + mvn deploy --settings travis/mvn-settings.xml -B -U -P sonatype-oss-release,linux -DskipTests=true -Dmaven.test.skip=true -Dgpg.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn } if [[ -n "$TRAVIS_TAG" ]]; then