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:52 UTC
[isis] 23/25: ISIS-2273: removing core references to
isis-core-unittestsupport, ctd
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 a47b83355fc439c93e30fd0b4b658a164ec7d3a2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 19:16:35 2020 +0000
ISIS-2273: removing core references to isis-core-unittestsupport, ctd
---
core/codegen-bytebuddy/pom.xml | 16 ----------------
.../commons/internal/reflection/ReflectTest.java | 2 +-
.../metamodel/facets/object/mixin/MixinIntendedAs.java | 0
.../facets/object/mixin/MixinIntendedAsActionTest.java | 0
.../facets/param/name/ParameterNameFacetTest.java | 0
core/runtime/pom.xml | 6 ++++++
core/runtimeservices/pom.xml | 6 ++++++
.../proxy/ProxyCreatorTestUsingCodegenPlugin.java | 0
core/security/pom.xml | 12 ++++++++++--
incubator/core/jsr303/pom.xml | 12 ------------
security/shiro/pom.xml | 6 ++++++
viewers/restfulobjects/rendering/pom.xml | 6 ++++++
viewers/restfulobjects/viewer/pom.xml | 5 +++++
viewers/wicket/model/pom.xml | 6 ++++++
viewers/wicket/ui/pom.xml | 7 +++++++
viewers/wicket/viewer/pom.xml | 6 ++++++
16 files changed, 59 insertions(+), 31 deletions(-)
diff --git a/core/codegen-bytebuddy/pom.xml b/core/codegen-bytebuddy/pom.xml
index 0ad22a8..3ed05e4 100644
--- a/core/codegen-bytebuddy/pom.xml
+++ b/core/codegen-bytebuddy/pom.xml
@@ -73,22 +73,6 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <exclusions>
- <exclusion>
- <!-- for dependency convergence -->
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
similarity index 98%
rename from core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
index fb4d6b8..cfadb66 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.commons.internal.reflection;
+package org.apache.isis.core.metamodel.commons.internal.reflection;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index f34a415..5a5ce630 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -104,6 +104,12 @@
</dependency>
<dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index 3909c2f..acc34b4 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -120,6 +120,12 @@
</dependency>
<dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
similarity index 100%
rename from core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 0072bdb..712615c 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -56,11 +56,13 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
@@ -77,6 +79,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/incubator/core/jsr303/pom.xml b/incubator/core/jsr303/pom.xml
index 642ace8..3c798a3 100644
--- a/incubator/core/jsr303/pom.xml
+++ b/incubator/core/jsr303/pom.xml
@@ -51,18 +51,6 @@
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
-
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index cc6c50a..12ccbea 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -137,6 +137,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/viewers/restfulobjects/rendering/pom.xml b/viewers/restfulobjects/rendering/pom.xml
index 98822a7..a68c01a 100644
--- a/viewers/restfulobjects/rendering/pom.xml
+++ b/viewers/restfulobjects/rendering/pom.xml
@@ -98,6 +98,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
diff --git a/viewers/restfulobjects/viewer/pom.xml b/viewers/restfulobjects/viewer/pom.xml
index 7ce0a51..43c3b34 100644
--- a/viewers/restfulobjects/viewer/pom.xml
+++ b/viewers/restfulobjects/viewer/pom.xml
@@ -114,6 +114,11 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index 1590141..0dbe721 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -121,6 +121,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index 6c9299f..2c99060 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -342,6 +342,13 @@
</exclusions>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index 435dcc2..366b29b 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -213,6 +213,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>