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 340f5e3 ISIS-1954: breaks cyclic dependencies with jassist plugin tests 340f5e3 is described below commit 340f5e30e9baffa4c2770453e956bc472fdca3b1 Author: Andi Huber <ahu...@apache.org> AuthorDate: Sat May 26 10:01:47 2018 +0200 ISIS-1954: breaks cyclic dependencies with jassist plugin tests introduces a new module: plugins-test/codegen-javassist-test Task-Url: https://issues.apache.org/jira/browse/ISIS-1954 --- .../plugins-test/codegen-javassist-test/.gitignore | 1 + .../codegen-javassist-test}/pom.xml | 27 +++++++--------------- .../ServiceInstantiatorTestUsingJavassist.java | 0 .../proxy/ProxyCreatorTestUsingJavassist.java | 0 core/plugins/codegen-javassist/pom.xml | 14 ----------- core/pom.xml | 4 ++++ core/unittestsupport/pom.xml | 5 ++++ 7 files changed, 18 insertions(+), 33 deletions(-) diff --git a/core/plugins-test/codegen-javassist-test/.gitignore b/core/plugins-test/codegen-javassist-test/.gitignore new file mode 100644 index 0000000..a48e45b --- /dev/null +++ b/core/plugins-test/codegen-javassist-test/.gitignore @@ -0,0 +1 @@ +/target-ide diff --git a/core/plugins/codegen-javassist/pom.xml b/core/plugins-test/codegen-javassist-test/pom.xml similarity index 79% copy from core/plugins/codegen-javassist/pom.xml copy to core/plugins-test/codegen-javassist-test/pom.xml index 2e5cf62..eecc45d 100644 --- a/core/plugins/codegen-javassist/pom.xml +++ b/core/plugins-test/codegen-javassist-test/pom.xml @@ -20,16 +20,16 @@ <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>isis-core-plugins-codegen-javassist</artifactId> + <artifactId>isis-core-plugins-codegen-javassist-test</artifactId> - <name>Apache Isis Plugin for Code Generation (Javassist)</name> + <name>Tests for Apache Isis Plugin for Code Generation (Javassist)</name> <description> - Code generation plugin using Javassist. + To break cyclic dependencies some tests needed to be moved to their own module (this). </description> <properties> - <jar-plugin.automaticModuleName>org.apache.isis.plugins.codegen-javassist</jar-plugin.automaticModuleName> - <git-plugin.propertiesDir>org/apache/isis/plugins/codegen-javassist</git-plugin.propertiesDir> + <jar-plugin.automaticModuleName>org.apache.isis.plugins.codegen-javassist-test</jar-plugin.automaticModuleName> + <git-plugin.propertiesDir>org/apache/isis/plugins/codegen-javassist-test</git-plugin.propertiesDir> </properties> <build> @@ -53,26 +53,15 @@ <dependencies> - <!-- compile dependencies --> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> + <!-- TEST --> <dependency> - <groupId>org.objenesis</groupId> - <artifactId>objenesis</artifactId> - </dependency> - - <dependency> <groupId>org.apache.isis.core</groupId> - <artifactId>isis-core-commons</artifactId> - <scope>compile</scope> + <artifactId>isis-core-plugins-codegen-javassist</artifactId> + <scope>test</scope> </dependency> - <!-- TEST --> - <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-wrapper</artifactId> diff --git a/core/plugins/codegen-javassist/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTestUsingJavassist.java b/core/plugins-test/codegen-javassist-test/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTestUsingJavassist.java similarity index 100% rename from core/plugins/codegen-javassist/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTestUsingJavassist.java rename to core/plugins-test/codegen-javassist-test/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTestUsingJavassist.java diff --git a/core/plugins/codegen-javassist/src/test/java/org/apache/isis/core/wrapper/proxy/ProxyCreatorTestUsingJavassist.java b/core/plugins-test/codegen-javassist-test/src/test/java/org/apache/isis/core/wrapper/proxy/ProxyCreatorTestUsingJavassist.java similarity index 100% rename from core/plugins/codegen-javassist/src/test/java/org/apache/isis/core/wrapper/proxy/ProxyCreatorTestUsingJavassist.java rename to core/plugins-test/codegen-javassist-test/src/test/java/org/apache/isis/core/wrapper/proxy/ProxyCreatorTestUsingJavassist.java diff --git a/core/plugins/codegen-javassist/pom.xml b/core/plugins/codegen-javassist/pom.xml index 2e5cf62..eaad977 100644 --- a/core/plugins/codegen-javassist/pom.xml +++ b/core/plugins/codegen-javassist/pom.xml @@ -70,20 +70,6 @@ <artifactId>isis-core-commons</artifactId> <scope>compile</scope> </dependency> - - <!-- TEST --> - - <dependency> - <groupId>org.apache.isis.core</groupId> - <artifactId>isis-core-wrapper</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.isis.core</groupId> - <artifactId>isis-core-unittestsupport</artifactId> - <scope>test</scope> - </dependency> </dependencies> diff --git a/core/pom.xml b/core/pom.xml index 42160ea..655bb50 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -2430,6 +2430,10 @@ ${license.additional-notes} <module>plugins/jaxrs-resteasy-4</module> <module>plugins/jdo-datanucleus-4</module> <module>plugins/jdo-datanucleus-5</module> + + <!-- to break cyclic dependencies some tests needed to be moved to their own modules --> + <module>plugins-test/codegen-javassist-test</module> + </modules> </project> diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml index e57c302..7b30bbf 100644 --- a/core/unittestsupport/pom.xml +++ b/core/unittestsupport/pom.xml @@ -48,6 +48,11 @@ <scope>test</scope> <optional>true</optional> </dependency> + <dependency> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis-core-plugins-codegen-javassist</artifactId> + <scope>runtime</scope> + </dependency> <!-- JUPITER --> <dependency> -- To stop receiving notification emails like this one, please contact ahu...@apache.org.