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 8d959e7 ISIS-1841 reorg dependencies such that 'commons' is the root of all 8d959e7 is described below commit 8d959e731d87ab3ca6b888f052b96a05072c9f21 Author: Andi Huber <ahu...@apache.org> AuthorDate: Tue May 22 14:04:57 2018 +0200 ISIS-1841 reorg dependencies such that 'commons' is the root of all provides compile dependency of JEE API for 'schema' and 'unittestsupport' which is now required for builds on jdk 10+, because java.xml.bind and java.xml.ws do no longer live in the jdk --- core/applib/pom.xml | 91 +++++++++++++++++++++++----------------------------- core/commons/pom.xml | 6 ++++ core/schema/pom.xml | 6 ++++ 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/core/applib/pom.xml b/core/applib/pom.xml index 84481d7..db3d15c 100644 --- a/core/applib/pom.xml +++ b/core/applib/pom.xml @@ -56,60 +56,55 @@ </excludes> </resource> </resources> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.datanucleus - </groupId> - <artifactId> - datanucleus-maven-plugin - </artifactId> - <versionRange> - [4.0.0-release,) - </versionRange> - <goals> - <goal>enhance</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> +<!-- [ahuber] possibly no longer required --> +<!-- <pluginManagement> --> +<!-- <plugins> --> +<!-- This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. --> +<!-- <plugin> --> +<!-- <groupId>org.eclipse.m2e</groupId> --> +<!-- <artifactId>lifecycle-mapping</artifactId> --> +<!-- <version>1.0.0</version> --> +<!-- <configuration> --> +<!-- <lifecycleMappingMetadata> --> +<!-- <pluginExecutions> --> +<!-- <pluginExecution> --> +<!-- <pluginExecutionFilter> --> +<!-- <groupId> --> +<!-- org.datanucleus --> +<!-- </groupId> --> +<!-- <artifactId> --> +<!-- datanucleus-maven-plugin --> +<!-- </artifactId> --> +<!-- <versionRange> --> +<!-- [4.0.0-release,) --> +<!-- </versionRange> --> +<!-- <goals> --> +<!-- <goal>enhance</goal> --> +<!-- </goals> --> +<!-- </pluginExecutionFilter> --> +<!-- <action> --> +<!-- <ignore /> --> +<!-- </action> --> +<!-- </pluginExecution> --> +<!-- </pluginExecutions> --> +<!-- </lifecycleMappingMetadata> --> +<!-- </configuration> --> +<!-- </plugin> --> +<!-- </plugins> --> +<!-- </pluginManagement> --> </build> <dependencies> - <dependency> + <dependency> <groupId>org.apache.isis.core</groupId> - <artifactId>isis-core-schema</artifactId> + <artifactId>isis-core-commons</artifactId> </dependency> - + <dependency> <groupId>org.apache.isis.core</groupId> - <artifactId>isis-core-commons</artifactId> + <artifactId>isis-core-schema</artifactId> </dependency> - - <!-- JEE API --> - <dependency> - <groupId>javax</groupId> - <artifactId>javaee-api</artifactId> - </dependency> <!-- JDO API (non transient, provided by plugin) --> <dependency> @@ -144,12 +139,6 @@ </exclusion> </exclusions> </dependency> - - <!-- provides @Nullable --> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> - </dependency> </dependencies> diff --git a/core/commons/pom.xml b/core/commons/pom.xml index 12d1e38..9e69a91 100644 --- a/core/commons/pom.xml +++ b/core/commons/pom.xml @@ -58,6 +58,12 @@ </build> <dependencies> + + <!-- JEE API --> + <dependency> + <groupId>javax</groupId> + <artifactId>javaee-api</artifactId> + </dependency> <!-- provides @Nullable --> <dependency> diff --git a/core/schema/pom.xml b/core/schema/pom.xml index 59f14ee..cdeccdc 100644 --- a/core/schema/pom.xml +++ b/core/schema/pom.xml @@ -40,6 +40,12 @@ </properties> <dependencies> + + <dependency> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis-core-commons</artifactId> + </dependency> + <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> -- To stop receiving notification emails like this one, please contact ahu...@apache.org.