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/10 15:22:18 UTC
[isis] 04/21: ISIS-2259: introduce parent for viewers/restfulobjects
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8b21f46ff429773a2c760e8248c0ba76d4e34fff
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:07:01 2020 +0000
ISIS-2259: introduce parent for viewers/restfulobjects
---
core/pom.xml | 1 +
core/viewers/restfulobjects/applib/pom.xml | 4 +--
.../restfulobjects/jaxrs-resteasy-4/pom.xml | 3 +-
.../viewers/restfulobjects/{rendering => }/pom.xml | 40 ++++++----------------
core/viewers/restfulobjects/rendering/pom.xml | 3 +-
core/viewers/restfulobjects/viewer/pom.xml | 3 +-
6 files changed, 16 insertions(+), 38 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 32d5f90..87a8d30 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1862,6 +1862,7 @@
<module>security/shiro</module>
<module>security/keycloak</module>
+ <module>viewers/restfulobjects</module>
<module>viewers/restfulobjects/applib</module>
<module>viewers/restfulobjects/rendering</module>
<module>viewers/restfulobjects/jaxrs-resteasy-4</module>
diff --git a/core/viewers/restfulobjects/applib/pom.xml b/core/viewers/restfulobjects/applib/pom.xml
index 6380215..137d1f2 100644
--- a/core/viewers/restfulobjects/applib/pom.xml
+++ b/core/viewers/restfulobjects/applib/pom.xml
@@ -22,9 +22,8 @@
<parent>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
+ <artifactId>isis-viewer-restfulobjects</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
@@ -37,7 +36,6 @@
<dependencies>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
index 0c15ed2..4bedb31 100644
--- a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
+++ b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
@@ -16,9 +16,8 @@
<parent>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
+ <artifactId>isis-viewer-restfulobjects</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-viewer-restfulobjects-jaxrsresteasy4</artifactId>
diff --git a/core/viewers/restfulobjects/rendering/pom.xml b/core/viewers/restfulobjects/pom.xml
similarity index 53%
copy from core/viewers/restfulobjects/rendering/pom.xml
copy to core/viewers/restfulobjects/pom.xml
index afa91a2..753d28f 100644
--- a/core/viewers/restfulobjects/rendering/pom.xml
+++ b/core/viewers/restfulobjects/pom.xml
@@ -18,43 +18,25 @@
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>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-viewer-restfulobjects-rendering</artifactId>
+ <artifactId>isis-viewer-restfulobjects</artifactId>
+ <name>Apache Isis Viewer - RO</name>
- <name>Apache Isis Viewer - RO (Rendering)</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.viewer.restfulobjects.rendering</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/viewer/restfulobjects/rendering</git-plugin.propertiesDir>
- </properties>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-viewer-restfulobjects-applib</artifactId>
- </dependency>
-
- <!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
+ <packaging>pom</packaging>
+ <modules>
+ <module>applib</module>
+ <module>rendering</module>
+ <module>viewer</module>
+ <module>jaxrs-resteasy-4</module>
+ </modules>
</project>
diff --git a/core/viewers/restfulobjects/rendering/pom.xml b/core/viewers/restfulobjects/rendering/pom.xml
index afa91a2..c803a7a 100644
--- a/core/viewers/restfulobjects/rendering/pom.xml
+++ b/core/viewers/restfulobjects/rendering/pom.xml
@@ -22,9 +22,8 @@
<parent>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
+ <artifactId>isis-viewer-restfulobjects</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
diff --git a/core/viewers/restfulobjects/viewer/pom.xml b/core/viewers/restfulobjects/viewer/pom.xml
index dafbb1d..13a2bcf 100644
--- a/core/viewers/restfulobjects/viewer/pom.xml
+++ b/core/viewers/restfulobjects/viewer/pom.xml
@@ -22,9 +22,8 @@
<parent>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
+ <artifactId>isis-viewer-restfulobjects</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-viewer-restfulobjects-viewer</artifactId>