You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/01/04 13:14:26 UTC
[isis] 01/01: ISIS-1978: updates dependencies for junit and
surefire to fix the issue.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b431915df8088517e4ccff21281e7aeb5d121bcd
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 4 13:12:50 2019 +0000
ISIS-1978: updates dependencies for junit and surefire to fix the issue.
---
core/pom.xml | 2 +-
example/application/helloworld/pom.xml | 4 ++++
.../application/simpleapp/module-simple/logging-integtest.properties | 2 +-
.../modules/simple/integtests/tests/SimpleObject_IntegTest.java | 3 +--
example/application/simpleapp/pom.xml | 4 ++++
5 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 87935de..01d9cc5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -179,7 +179,7 @@
<htmlparser.version>2.1</htmlparser.version>
- <junit.version>5.2.0</junit.version>
+ <junit.version>5.3.1</junit.version>
<!-- 2.8.1 depends on cglib-nodep 3.1 whereas axonframework depends on 2.2.2 -->
<jmock.version>2.6.0</jmock.version>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index a69f274..33f2ced 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -53,6 +53,10 @@
<datanucleus-jodatime.version>5.2.0-m1</datanucleus-jodatime.version>
<hsqldb.version>2.4.1</hsqldb.version>
+ <!-- override incode-build -->
+ <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+ <maven-surefire-report-plugin.version>2.22.1</maven-surefire-report-plugin.version>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/example/application/simpleapp/module-simple/logging-integtest.properties b/example/application/simpleapp/module-simple/logging-integtest.properties
index cd0606a..a3a512b 100644
--- a/example/application/simpleapp/module-simple/logging-integtest.properties
+++ b/example/application/simpleapp/module-simple/logging-integtest.properties
@@ -19,7 +19,7 @@
#
# Isis uses log4j is used to provide system logging
#
-log4j.rootCategory=DEBUG, Console
+log4j.rootCategory=INFO, Console
# The console appender
log4j.appender.Console=org.apache.log4j.ConsoleAppender
diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
index da0b2f8..a2b32da 100644
--- a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
@@ -22,15 +22,14 @@ import java.sql.Timestamp;
import javax.inject.Inject;
-import org.junit.Assert;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.InvalidException;
import org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusIdLong;
import org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionTimestamp;
-import org.hamcrest.CoreMatchers;
import domainapp.modules.simple.dom.impl.SimpleObject;
import domainapp.modules.simple.fixture.SimpleObject_persona;
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 901b672..b241150 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -56,6 +56,10 @@
<datanucleus-jodatime.version>5.2.0-m1</datanucleus-jodatime.version>
<hsqldb.version>2.4.1</hsqldb.version>
+ <!-- override incode-build -->
+ <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+ <maven-surefire-report-plugin.version>2.22.1</maven-surefire-report-plugin.version>
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>