This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 74e06f9ead ISIS-3209: remove outdated internal testsupport deps.
74e06f9ead is described below
commit 74e06f9eada1743c6481e0334c6da02ed00213a5
Author: Andi Huber <[email protected]>
AuthorDate: Tue Sep 13 09:31:37 2022 +0200
ISIS-3209: remove outdated internal testsupport deps.
---
core/config/pom.xml | 2 +-
core/interaction/pom.xml | 2 +-
core/internaltestsupport/pom.xml | 95 ++++----------------
.../contract/ComparableContractTest_compareTo.java | 4 +-
.../contract/ValueTypeContractTestAbstract.java | 13 ++-
core/internaltestvintage/pom.xml | 100 +--------------------
core/metamodel/pom.xml | 15 +---
core/runtimeservices/pom.xml | 2 +-
extensions/core/excel/applib/pom.xml | 2 +-
security/shiro/pom.xml | 2 +-
viewers/restfulobjects/applib/pom.xml | 13 +--
viewers/restfulobjects/rendering/pom.xml | 2 +-
12 files changed, 39 insertions(+), 213 deletions(-)
diff --git a/core/config/pom.xml b/core/config/pom.xml
index c4563a32e0..dc7a58f600 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -99,7 +99,7 @@
<!-- TESTS -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
+ <artifactId>isis-core-internaltestvintage</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/interaction/pom.xml b/core/interaction/pom.xml
index 5b8870d26a..ae40993c89 100644
--- a/core/interaction/pom.xml
+++ b/core/interaction/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
+ <artifactId>isis-core-internaltestvintage</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/internaltestsupport/pom.xml b/core/internaltestsupport/pom.xml
index 777b1f1e8b..86b3a60535 100644
--- a/core/internaltestsupport/pom.xml
+++ b/core/internaltestsupport/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
- license agreements. See the NOTICE file distributed with this work for
additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not
use
- this file except in compliance with the License. You may obtain a copy
of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
- by applicable law or agreed to in writing, software distributed under
the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file
to
+ you under the Apache License, Version 2.0 (the "License"); you may not
use
+ this file except in compliance with the License. You may obtain a copy
of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
+ by applicable law or agreed to in writing, software distributed under
the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the
specific
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
@@ -29,7 +29,7 @@
</properties>
<description>
- Support for writing unit tests in either JUnit 4 or JUnit 5; should be
added as a dependency with scope=test only
+ Support for writing unit tests in JUnit 5; should be added as a
dependency with scope=test only
</description>
<dependencies>
@@ -48,18 +48,14 @@
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
</dependency>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -77,18 +73,12 @@
</exclusions>
</dependency>
- <!-- framework default codegen for tests -->
+ <!-- framework default codegen (also) for tests -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-codegen-bytebuddy</artifactId>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>compile</scope>
- </dependency>
-
<!-- JDO API (non transient, provided by plugin) -->
<dependency>
<!-- v3.2 not available yet, use datanucleus staging
for now -->
@@ -100,11 +90,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
<!-- SPRING -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -115,13 +100,7 @@
<artifactId>asm</artifactId>
</exclusion>
<exclusion>
- <!-- when spring-boot release lags
behind spring-core release explicitly
- spring-test added below -->
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </exclusion>
- <exclusion>
- <!-- when spring-boot release lags
behind spring-core release explicitly
+ <!-- when spring-boot release lags
behind spring-core release explicitly
spring-test added below -->
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -137,45 +116,9 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </dependency>
-
<dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
diff --git
a/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/contract/ComparableContractTest_compareTo.java
b/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/contract/ComparableContractTest_compareTo.java
index b42cbb48e3..c4c85f90ed 100644
---
a/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/contract/ComparableContractTest_compareTo.java
+++
b/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/contract/ComparableContractTest_compareTo.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.internaltestsupport.contract;
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* <p>
@@ -50,7 +50,7 @@ public abstract class ComparableContractTest_compareTo<T
extends Comparable<T>>
* Syntax sugar to remove boilerplate from subclasses.
*/
@SafeVarargs
- protected static <E> List<E> listOf(E... elements) {
+ protected static <E> List<E> listOf(final E... elements) {
return Arrays.asList(elements);
}
diff --git
a/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/contract/ValueTypeContractTestAbstract.java
b/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/contract/ValueTypeContractTestAbstract.java
index d51d1f01d9..c049bcfd1b 100644
---
a/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/contract/ValueTypeContractTestAbstract.java
+++
b/core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/contract/ValueTypeContractTestAbstract.java
@@ -20,8 +20,8 @@ package org.apache.isis.core.internaltestsupport.contract;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
@@ -29,7 +29,6 @@ import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assume.assumeThat;
/**
* Contract test for value types ({@link #equals(Object) equals} and
@@ -42,7 +41,7 @@ import static org.junit.Assume.assumeThat;
*/
public abstract class ValueTypeContractTestAbstract<T> {
- @Before
+ @BeforeEach
public void setUp() throws Exception {
assertSizeAtLeast(getObjectsWithSameValue(), 2);
assertSizeAtLeast(getObjectsWithDifferentValue(), 1);
@@ -101,11 +100,11 @@ public abstract class ValueTypeContractTestAbstract<T> {
@SuppressWarnings({ "rawtypes", "unchecked" })
public void comparableEquivalence() throws Exception {
for (final T o1 : getObjectsWithSameValue()) {
- assumeThat(o1 instanceof Comparable, is(true));
+ if(! (o1 instanceof Comparable)) continue;
Comparable c1 = (Comparable)o1;
for (final T o2 : getObjectsWithSameValue()) {
- assumeThat(o2 instanceof Comparable, is(true));
+ if(! (o2 instanceof Comparable)) continue;
Comparable c2 = (Comparable)o2;
assertThat(c1.compareTo(c2), is(0));
@@ -113,7 +112,7 @@ public abstract class ValueTypeContractTestAbstract<T> {
}
for (final T o2 : getObjectsWithDifferentValue()) {
- assumeThat(o2 instanceof Comparable, is(true));
+ if(! (o2 instanceof Comparable)) continue;
Comparable c2 = (Comparable)o2;
final int x = c1.compareTo(c2);
diff --git a/core/internaltestvintage/pom.xml b/core/internaltestvintage/pom.xml
index a6c7d3ea9e..30dd974e93 100644
--- a/core/internaltestvintage/pom.xml
+++ b/core/internaltestvintage/pom.xml
@@ -35,18 +35,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.commons</groupId>
- <artifactId>isis-commons</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-internaltestsupport</artifactId>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- </dependency>
+ <!-- LEGACY TESTING SUPPORT -->
+
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
@@ -57,92 +51,6 @@
<artifactId>assertj-core</artifactId>
</dependency>
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.bytebuddy</groupId>
-
<artifactId>byte-buddy-agent</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- framework default codegen for tests -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-codegen-bytebuddy</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <!-- JDO API (non transient, provided by plugin) -->
- <dependency>
- <!-- v3.2 not available yet, use datanucleus staging
for now -->
- <!-- <groupId>javax.jdo</groupId> -->
- <!-- <artifactId>jdo-api</artifactId> -->
- <groupId>org.datanucleus</groupId>
- <artifactId>javax.jdo</artifactId>
- <!-- provided by plugins -->
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <!-- SPRING -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <!-- when spring-boot release lags
behind spring-core release explicitly
- spring-test added below -->
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </exclusion>
- <exclusion>
- <!-- when spring-boot release lags
behind spring-core release explicitly
- spring-test added below -->
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <!-- we use log4j-2 instead -->
-
<groupId>org.springframework.boot</groupId>
-
<artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </dependency>
-
<dependency>
<groupId>org.picocontainer</groupId>
<artifactId>picocontainer</artifactId>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 2903f9652c..50c33009bf 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -113,22 +113,9 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
+ <artifactId>isis-core-internaltestvintage</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- transitively provided by isis-jdk-supplemental -->
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index 48241aff5d..45bbb7d1e1 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
+ <artifactId>isis-core-internaltestvintage</artifactId>
<scope>test</scope>
</dependency>
diff --git a/extensions/core/excel/applib/pom.xml
b/extensions/core/excel/applib/pom.xml
index d57767d67a..0cd72924a1 100644
--- a/extensions/core/excel/applib/pom.xml
+++ b/extensions/core/excel/applib/pom.xml
@@ -82,7 +82,7 @@
<!-- test -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
+ <artifactId>isis-core-internaltestvintage</artifactId>
<scope>test</scope>
</dependency>
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index 3fb66d530f..50c40678df 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
+ <artifactId>isis-core-internaltestvintage</artifactId>
<scope>test</scope>
</dependency>
diff --git a/viewers/restfulobjects/applib/pom.xml
b/viewers/restfulobjects/applib/pom.xml
index d456b47cf6..cc7b24380d 100644
--- a/viewers/restfulobjects/applib/pom.xml
+++ b/viewers/restfulobjects/applib/pom.xml
@@ -55,21 +55,10 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
+ <artifactId>isis-core-internaltestvintage</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
- <repositories>
- <!-- The artifact in the maven repository has been moved and causes a
build failure. Using this setting gets the artifact allowing the build to work.
This fix should hopefully be temporary -->
- <repository>
- <id>java.net</id>
- <url>https://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
</project>
diff --git a/viewers/restfulobjects/rendering/pom.xml
b/viewers/restfulobjects/rendering/pom.xml
index 77a1740b6f..2317c7ce24 100644
--- a/viewers/restfulobjects/rendering/pom.xml
+++ b/viewers/restfulobjects/rendering/pom.xml
@@ -49,7 +49,7 @@
<!-- TEST DEPENDENCIES -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
+ <artifactId>isis-core-internaltestvintage</artifactId>
<scope>test</scope>
</dependency>
