You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/03/03 23:07:09 UTC
[isis] branch master updated: ISIS-1891 restructure maven
dependencies
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 6172ccb ISIS-1891 restructure maven dependencies
6172ccb is described below
commit 6172ccbfaa07a3b90b77c07a84ae13a6aa8422d0
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Mar 4 00:07:05 2018 +0100
ISIS-1891 restructure maven dependencies
remove resteasy dependencies from core modules
only depending on standard api now
---
core/pom.xml | 79 +++-----
core/runtime/pom.xml | 264 +++++++++++++--------------
core/viewer-restfulobjects-applib/pom.xml | 35 ----
core/viewer-restfulobjects-rendering/pom.xml | 8 -
core/viewer-restfulobjects-server/pom.xml | 23 +--
5 files changed, 164 insertions(+), 245 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index a7c6645..25eb32f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -111,6 +111,14 @@
<dn4-jodatime.version>4.1.0-release</dn4-jodatime.version>
<dn4-maven-plugin.version>4.0.2</dn4-maven-plugin.version>
+ <!-- Resteasy Plugin 3 (for JEE 7 JAX-RS API 2.0) -->
+
+ <resteasy3-jaxrs.version>3.0.17.Final</resteasy3-jaxrs.version>
+
+ <!-- Resteasy Plugin 4 (for JEE 8 JAX-RS API 2.1) -->
+
+ <resteasy4-jaxrs.version>4.0.0.Beta2</resteasy4-jaxrs.version>
+
<!-- ... -->
<shiro.version>1.2.6</shiro.version>
@@ -147,7 +155,6 @@
<!-- using 2.3.3 throws SQL exception in simpleapp integtests -->
<hsqldb.version>2.3.4</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
- <resteasy-jaxrs.version>3.0.24.Final</resteasy-jaxrs.version>
<jetty.version>9.4.3.v20170317</jetty.version>
@@ -1131,7 +1138,7 @@ ${license.additional-notes}
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <!-- overriddes the default ('clean verify') -->
+ <!-- overrides the default ('clean verify') -->
<preparationGoals>clean install</preparationGoals>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
@@ -1153,6 +1160,20 @@ ${license.additional-notes}
<!-- is also for benefit of application developers, using scope=import -->
<dependencies>
+ <!-- JEE API -->
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>${javaee.version}</version>
+ </dependency>
+
+ <!-- JDO API -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ </dependency>
+
<!-- unittestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -1284,7 +1305,7 @@ ${license.additional-notes}
<scope>test</scope>
</dependency>
- <!-- runtime -->
+ <!-- runtime legacy -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime-legacy</artifactId>
@@ -1460,6 +1481,8 @@ ${license.additional-notes}
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
+
+ <!-- Axon -->
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-core</artifactId>
@@ -1627,41 +1650,6 @@ ${license.additional-notes}
<version>${shiro.version}</version>
</dependency>
-
- <!-- RestEasy -->
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy-jaxrs.version}</version>
- <exclusions>
- <!-- instead use geronimo-servlet_3.0_spec -->
- <exclusion>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.1_spec</artifactId>
- </exclusion>
- <!-- instead use org.apache.geronimo.specs:geronimo-annotation_1.0_spec -->
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- <!-- org.apache.geronimo.specs:geronimo-activation_1.1_spec -->
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- <version>${resteasy-jaxrs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson-provider</artifactId>
- <version>${resteasy-jaxrs.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
@@ -2020,20 +2008,7 @@ ${license.additional-notes}
<scope>test</scope>
</dependency>
- <!-- JEE API -->
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>${javaee.version}</version>
- </dependency>
-
- <!-- JDO API -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- <scope></scope> <!-- TODO provided by plugin -->
- </dependency>
+
<!-- JAX-RS API -->
<dependency>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 41b84f4..eafa51e 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -1,51 +1,44 @@
<?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 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
+<!-- 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"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
<name>Apache Isis Runtime</name>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.core.runtime</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/core/runtime</git-plugin.propertiesDir>
- </properties>
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.runtime</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/runtime</git-plugin.propertiesDir>
+ </properties>
- <build>
+ <build>
<resources>
- <resource>
- <directory>src/main/java</directory>
- <filtering>false</filtering>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
<resource>
<directory>src/main/resources</directory>
<includes>
@@ -58,15 +51,15 @@
<filtering>false</filtering>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
@@ -77,95 +70,102 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-log4j</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-metamodel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-metamodel</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-schema</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+
+ <dependency>
+ <!-- because DataNucleus uses log4j as its preferred logger -->
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <!-- required because resteasy-jaxrs declares as a test dependency whereas
+ httpclient4 needs it as a compile dependency -->
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <!-- for our home-grown proxies for @RequestScoped -->
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-schema</artifactId>
- </dependency>
-
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
- <!-- because DataNucleus uses log4j as its preferred logger -->
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <!-- for our home-grown proxies for @RequestScoped -->
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
</dependencies>
- <profiles>
- <profile>
- <id>email-notification-service</id>
- <activation>
- <property>
- <name>!skip.email-notification-service</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <version>${commons-email.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>${com-sun-mail.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
+ <profiles>
+ <profile>
+ <id>email-notification-service</id>
+ <activation>
+ <property>
+ <name>!skip.email-notification-service</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ <version>${commons-email.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>${com-sun-mail.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ </profiles>
</project>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index e3206ae..47e75c5 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -62,41 +62,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <exclusions>
- <!-- clashes with axon -->
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <!--
- required because resteasy-jaxrs declares as a test dependency
- whereas httpclient4 needs it as a compile dependency -->
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- </dependency>
</dependencies>
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 7a9feb3..b12657d 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -43,14 +43,6 @@
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson-provider</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 12abc6c..32d8bff 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -48,28 +48,15 @@
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
</dependency>
-<!-- replaced by javaee-api -->
-
- <!-- the javax:* equivalents of these are excluded in
- dependencyManagement of resteasy-jaxrs, so
- are required here -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.geronimo.specs</groupId> -->
-<!-- <artifactId>geronimo-servlet_3.0_spec</artifactId> -->
-<!-- <scope>provided</scope> -->
-<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.geronimo.specs</groupId> -->
-<!-- <artifactId>geronimo-annotation_1.0_spec</artifactId> -->
-<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.geronimo.specs</groupId> -->
-<!-- <artifactId>geronimo-activation_1.1_spec</artifactId> -->
-<!-- </dependency> -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ </dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-servlet-2.x</artifactId>
</dependency>
+
</dependencies>
</project>
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.