This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/master by this push: new fbac750 NO-JIRA: revert commit d3cacdc24c6f43e88532ab6feb95b1c0f6686d01 as it appears it prevents the build working on master. fbac750 is described below commit fbac750e3f6170acd9518216c6d4b23fafed4b8a Author: Robbie Gemmell <rob...@apache.org> AuthorDate: Thu Dec 3 09:32:27 2020 +0000 NO-JIRA: revert commit d3cacdc24c6f43e88532ab6feb95b1c0f6686d01 as it appears it prevents the build working on master. --- .travis.yml | 2 +- etc/logback.xml | 10 ++++------ pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94a9ea4..8061245 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,4 @@ jdk: env: - phase="test" pl="" additionalprops="" - phase="verify" pl="-pl systests/protocol-tests-amqp-0-8,systests/protocol-tests-amqp-0-10,systests/protocol-tests-amqp-1-0,systests/qpid-systests-jms_1.1,systests/qpid-systests-jms_2.0,systests/qpid-systests-http-management" additionalprops="-DskipTests=false -DskipITs=false" -script: "mvn --fail-at-end ${phase} ${pl} ${additionalprops}" -DargLine="-Dlogback.configurationFile=${TRAVIS_BUILD_DIR}/etc/logback.xml -Dlogback.statusListenerClass=ch.qos.logback.core.status.OnConsoleStatusListener" -Dqpid.tests.redirectTestOutputToFile=false +script: "mvn --fail-at-end ${phase} ${pl} ${additionalprops}" diff --git a/etc/logback.xml b/etc/logback.xml index ef30c46..3ef42b2 100644 --- a/etc/logback.xml +++ b/etc/logback.xml @@ -17,18 +17,16 @@ specific language governing permissions and limitations under the License. --> -<configuration debug="true"> +<configuration scan="true" scanPeriod="10 seconds"> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> <target>System.out</target> <encoder> - <pattern>%date %-5level [%thread] %logger{10} %msg%n</pattern> + <pattern>%msg%n</pattern> </encoder> </appender> - <logger name="org.eclipse.jetty" level="warn" /> - <logger name="org.apache" level="warn" /> - <logger name="org.apache.qpid" level="debug" /> - <root level="info"> + + <root level=""> <appender-ref ref="CONSOLE"/> </root> </configuration> diff --git a/pom.xml b/pom.xml index ee62031..619f296 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ <profile.test_receive_timeout>1000</profile.test_receive_timeout> <profile.qpid.tests.mms.messagestore.persistence>true</profile.qpid.tests.mms.messagestore.persistence> <profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint> - <qpid.tests.redirectTestOutputToFile>true</qpid.tests.redirectTestOutputToFile> + <dollar.sign>$</dollar.sign> <at.sign>@</at.sign> @@ -984,7 +984,7 @@ <includes> <include>**/*Test.java</include> </includes> - <redirectTestOutputToFile>${qpid.tests.redirectTestOutputToFile}</redirectTestOutputToFile> + <redirectTestOutputToFile>true</redirectTestOutputToFile> <reportsDirectory>${test.output.dir}</reportsDirectory> <systemPropertyVariables> <!-- Defaults --> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org