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 2020/01/29 19:38:38 UTC
[isis] 09/25: ISIS-2273: fixing compile issues
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b4468a2b09e1d70bc18fdf2e338bd53e65df11e6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:30:59 2020 +0000
ISIS-2273: fixing compile issues
---
api/applib/pom.xml | 1 -
core/metamodel/pom.xml | 45 ++++++++++++++++++++++
.../metamodel/MetaModelContext_forTesting.java | 2 +-
.../oid/CollectionOidTest_valueSemantics.java | 2 +-
...dDefaultTest_valueSemantics_whenPersistent.java | 2 +-
5 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 27c0b2b..2b1f3e8 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -130,7 +130,6 @@
</exclusions>
</dependency>
-
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 5809749..ba7c946 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -128,6 +128,51 @@
<scope>test</scope>
</dependency>
+ <!-- TEST -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index da2fe83..7f989e0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -113,7 +113,7 @@ public final class MetaModelContext_forTesting implements MetaModelContext {
private List<Object> singletons;
//@Override
- public efereIsisConfigurationLegacy getConfigurationLegacy() {
+ public IsisConfigurationLegacy getConfigurationLegacy() {
return _Config.getConfiguration();
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
index 2afaa7d..e1c5228 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.adapter.oid;
import java.util.Arrays;
import java.util.List;
+import org.apache.isis.applib.unittestsupport.ValueTypeContractTestAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class CollectionOidTest_valueSemantics extends ValueTypeContractTestAbstract<ParentedOid> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
index 715ef07..fa7fc68 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.adapter.oid;
import java.util.Arrays;
import java.util.List;
+import org.apache.isis.applib.unittestsupport.ValueTypeContractTestAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class RootOidDefaultTest_valueSemantics_whenPersistent extends ValueTypeContractTestAbstract<RootOid> {