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/11 17:43:04 UTC
[isis] branch master updated (6885600 -> 36997d3)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 6885600 ISIS-2259: isis-core-webboot-springboot to isis-core-webspringboot
new fe66a6a ISIS-2062: changes the groupId of isis-security-xxx and isis-viewer-xx artifactIds
new 36997d3 ISIS-2259: fixes issues with mvn versions:set
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/pom.xml | 33 +++++++++++------------
examples/smoketests/pom.xml | 2 +-
extensions/security/secman/pom.xml | 6 ++---
extensions/security/secman/shiro-realm/pom.xml | 2 +-
extensions/security/shiro-realm-ldap/impl/pom.xml | 2 +-
extensions/vw/exceldownload/ui/pom.xml | 2 +-
extensions/vw/pdfjs/ui/pom.xml | 2 +-
incubator/extensions/core/model/pom.xml | 2 +-
legacy/extensions/core/runtime/pom.xml | 2 +-
legacy/mappings/restclient/pom.xml | 2 +-
legacy/testing/mavenplugin/pom.xml | 2 +-
mappings/pom.xml | 2 +-
mavendeps/webapp/pom.xml | 12 ++++-----
security/bypass/pom.xml | 1 +
security/keycloak/pom.xml | 3 ++-
security/shiro/pom.xml | 3 ++-
subdomains/pom.xml | 2 +-
testing/integtestsupport/applib/pom.xml | 2 +-
testing/pom.xml | 2 +-
valuetypes/asciidoc/ui/pom.xml | 2 +-
valuetypes/markdown/ui/pom.xml | 2 +-
valuetypes/sse/applib/pom.xml | 2 +-
valuetypes/sse/ui/pom.xml | 2 +-
viewers/restfulobjects/applib/pom.xml | 2 +-
viewers/restfulobjects/jaxrs-resteasy-4/pom.xml | 10 +++----
viewers/restfulobjects/pom.xml | 1 +
viewers/restfulobjects/rendering/pom.xml | 4 +--
viewers/restfulobjects/viewer/pom.xml | 4 +--
viewers/wicket/model/pom.xml | 2 +-
viewers/wicket/pom.xml | 1 +
viewers/wicket/ui/pom.xml | 4 +--
viewers/wicket/viewer/pom.xml | 4 +--
32 files changed, 64 insertions(+), 60 deletions(-)
[isis] 01/02: ISIS-2062: changes the groupId of isis-security-xxx
and isis-viewer-xx artifactIds
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit fe66a6a646f3b8f450fb9f032a42282acc2d5bbc
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 11 15:46:21 2020 +0000
ISIS-2062: changes the groupId of isis-security-xxx and isis-viewer-xx artifactIds
for consistency with other families of artifacts, these are now groupId of o.a.i.security and o.a.i.viewer respectively.
---
core/pom.xml | 32 +++++++++++------------
examples/smoketests/pom.xml | 2 +-
extensions/security/secman/shiro-realm/pom.xml | 2 +-
extensions/security/shiro-realm-ldap/impl/pom.xml | 2 +-
extensions/vw/exceldownload/ui/pom.xml | 2 +-
extensions/vw/pdfjs/ui/pom.xml | 2 +-
incubator/extensions/core/model/pom.xml | 2 +-
legacy/extensions/core/runtime/pom.xml | 2 +-
legacy/mappings/restclient/pom.xml | 2 +-
legacy/testing/mavenplugin/pom.xml | 2 +-
mavendeps/webapp/pom.xml | 12 ++++-----
security/bypass/pom.xml | 1 +
security/keycloak/pom.xml | 3 ++-
security/shiro/pom.xml | 3 ++-
testing/integtestsupport/applib/pom.xml | 2 +-
valuetypes/asciidoc/ui/pom.xml | 2 +-
valuetypes/markdown/ui/pom.xml | 2 +-
valuetypes/sse/applib/pom.xml | 2 +-
valuetypes/sse/ui/pom.xml | 2 +-
viewers/restfulobjects/applib/pom.xml | 2 +-
viewers/restfulobjects/jaxrs-resteasy-4/pom.xml | 10 +++----
viewers/restfulobjects/pom.xml | 1 +
viewers/restfulobjects/rendering/pom.xml | 4 +--
viewers/restfulobjects/viewer/pom.xml | 4 +--
viewers/wicket/model/pom.xml | 2 +-
viewers/wicket/pom.xml | 1 +
viewers/wicket/ui/pom.xml | 4 +--
viewers/wicket/viewer/pom.xml | 4 +--
28 files changed, 58 insertions(+), 53 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index a267727..991efc3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -809,36 +809,36 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-viewer</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-viewer</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
@@ -850,17 +850,17 @@
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-bypass</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-shiro</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-keycloak</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -880,41 +880,41 @@
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-jaxrsresteasy4</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-viewer</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-viewer</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<scope>test</scope>
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index bc6fb0c..1991ba6 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -66,7 +66,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-shiro</artifactId>
</dependency>
diff --git a/extensions/security/secman/shiro-realm/pom.xml b/extensions/security/secman/shiro-realm/pom.xml
index 7c83d36..13f55de 100644
--- a/extensions/security/secman/shiro-realm/pom.xml
+++ b/extensions/security/secman/shiro-realm/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-shiro</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions/security/shiro-realm-ldap/impl/pom.xml b/extensions/security/shiro-realm-ldap/impl/pom.xml
index 2057761..ec3c302 100644
--- a/extensions/security/shiro-realm-ldap/impl/pom.xml
+++ b/extensions/security/shiro-realm-ldap/impl/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-shiro</artifactId>
</dependency>
diff --git a/extensions/vw/exceldownload/ui/pom.xml b/extensions/vw/exceldownload/ui/pom.xml
index 3b5af9d..cf58939 100644
--- a/extensions/vw/exceldownload/ui/pom.xml
+++ b/extensions/vw/exceldownload/ui/pom.xml
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
<scope>provided</scope>
<exclusions>
diff --git a/extensions/vw/pdfjs/ui/pom.xml b/extensions/vw/pdfjs/ui/pom.xml
index 5648b3b..a169405 100644
--- a/extensions/vw/pdfjs/ui/pom.xml
+++ b/extensions/vw/pdfjs/ui/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
</dependency>
</dependencies>
diff --git a/incubator/extensions/core/model/pom.xml b/incubator/extensions/core/model/pom.xml
index f80b873..a42325f 100644
--- a/incubator/extensions/core/model/pom.xml
+++ b/incubator/extensions/core/model/pom.xml
@@ -46,7 +46,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/legacy/extensions/core/runtime/pom.xml b/legacy/extensions/core/runtime/pom.xml
index 14e5b0f..e613cac 100644
--- a/legacy/extensions/core/runtime/pom.xml
+++ b/legacy/extensions/core/runtime/pom.xml
@@ -76,7 +76,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/legacy/mappings/restclient/pom.xml b/legacy/mappings/restclient/pom.xml
index e15a37e..be8a788 100644
--- a/legacy/mappings/restclient/pom.xml
+++ b/legacy/mappings/restclient/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
</dependency>
diff --git a/legacy/testing/mavenplugin/pom.xml b/legacy/testing/mavenplugin/pom.xml
index 200264a..6e0dd57 100644
--- a/legacy/testing/mavenplugin/pom.xml
+++ b/legacy/testing/mavenplugin/pom.xml
@@ -78,7 +78,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-bypass</artifactId>
</dependency>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 87c8867..eb39d8a 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -97,16 +97,16 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-viewer</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-viewer</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-jaxrsresteasy4</artifactId>
</dependency>
@@ -115,15 +115,15 @@
<artifactId>isis-core-security</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-bypass</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-shiro</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-keycloak</artifactId>
</dependency>
diff --git a/security/bypass/pom.xml b/security/bypass/pom.xml
index 4e9446f..c317d60 100644
--- a/security/bypass/pom.xml
+++ b/security/bypass/pom.xml
@@ -27,6 +27,7 @@
<relativePath>../../core/pom.xml</relativePath>
</parent>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-bypass</artifactId>
<name>Apache Isis Security - Bypass</name>
diff --git a/security/keycloak/pom.xml b/security/keycloak/pom.xml
index c48063f..8df1a9e 100644
--- a/security/keycloak/pom.xml
+++ b/security/keycloak/pom.xml
@@ -27,6 +27,7 @@
<relativePath>../../core/pom.xml</relativePath>
</parent>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-keycloak</artifactId>
<name>Apache Isis Security - Keycloak</name>
@@ -44,7 +45,7 @@
<!-- for benefit of application developers, using scope=import -->
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-keycloak</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index 25b3ab6..6ef0ca5 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -27,6 +27,7 @@
<relativePath>../../core/pom.xml</relativePath>
</parent>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-shiro</artifactId>
<name>Apache Isis Security - Shiro</name>
@@ -44,7 +45,7 @@
<!-- for benefit of application developers, using scope=import -->
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-shiro</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/testing/integtestsupport/applib/pom.xml b/testing/integtestsupport/applib/pom.xml
index 9b1c3ab..1e95c69 100644
--- a/testing/integtestsupport/applib/pom.xml
+++ b/testing/integtestsupport/applib/pom.xml
@@ -137,7 +137,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-bypass</artifactId>
</dependency>
diff --git a/valuetypes/asciidoc/ui/pom.xml b/valuetypes/asciidoc/ui/pom.xml
index d963318..5599a87 100644
--- a/valuetypes/asciidoc/ui/pom.xml
+++ b/valuetypes/asciidoc/ui/pom.xml
@@ -41,7 +41,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/valuetypes/markdown/ui/pom.xml b/valuetypes/markdown/ui/pom.xml
index 0de8750..8dd8c68 100644
--- a/valuetypes/markdown/ui/pom.xml
+++ b/valuetypes/markdown/ui/pom.xml
@@ -41,7 +41,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
</dependency>
diff --git a/valuetypes/sse/applib/pom.xml b/valuetypes/sse/applib/pom.xml
index e4b67a3..ef0093a 100644
--- a/valuetypes/sse/applib/pom.xml
+++ b/valuetypes/sse/applib/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/valuetypes/sse/ui/pom.xml b/valuetypes/sse/ui/pom.xml
index bc1aa7a..704b1fd 100644
--- a/valuetypes/sse/ui/pom.xml
+++ b/valuetypes/sse/ui/pom.xml
@@ -47,7 +47,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/viewers/restfulobjects/applib/pom.xml b/viewers/restfulobjects/applib/pom.xml
index 052d61c..65ac39d 100644
--- a/viewers/restfulobjects/applib/pom.xml
+++ b/viewers/restfulobjects/applib/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
index 6958bd5..6694c39 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
@@ -56,7 +56,7 @@
<!-- COMPILE DEPENDENCIES -->
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
<exclusions>
<exclusion>
@@ -67,7 +67,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-viewer</artifactId>
<scope>compile</scope>
</dependency>
@@ -107,14 +107,14 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-viewer</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
<type>test-jar</type>
<scope>test</scope>
diff --git a/viewers/restfulobjects/pom.xml b/viewers/restfulobjects/pom.xml
index 3cfc2ad..6364f83 100644
--- a/viewers/restfulobjects/pom.xml
+++ b/viewers/restfulobjects/pom.xml
@@ -27,6 +27,7 @@
<relativePath>../../core/pom.xml</relativePath>
</parent>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
<name>Apache Isis Viewer - RO</name>
diff --git a/viewers/restfulobjects/rendering/pom.xml b/viewers/restfulobjects/rendering/pom.xml
index 3e9911d..c6b0889 100644
--- a/viewers/restfulobjects/rendering/pom.xml
+++ b/viewers/restfulobjects/rendering/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
@@ -42,7 +42,7 @@
<artifactId>isis-core-runtime</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
</dependency>
diff --git a/viewers/restfulobjects/viewer/pom.xml b/viewers/restfulobjects/viewer/pom.xml
index 6785000..15fc084 100644
--- a/viewers/restfulobjects/viewer/pom.xml
+++ b/viewers/restfulobjects/viewer/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
@@ -43,7 +43,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
</dependency>
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index d1d172e..0df92e7 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
diff --git a/viewers/wicket/pom.xml b/viewers/wicket/pom.xml
index 45991e5..714b59a 100644
--- a/viewers/wicket/pom.xml
+++ b/viewers/wicket/pom.xml
@@ -28,6 +28,7 @@
<relativePath>../../core/pom.xml</relativePath>
</parent>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
<name>Apache Isis Viewer - Wicket</name>
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index 6f83290..333c607 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
@@ -64,7 +64,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
</dependency>
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index 1ece1ea..7a39974 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
@@ -57,7 +57,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
</dependency>
[isis] 02/02: ISIS-2259: fixes issues with mvn versions:set
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 36997d35d288673fb657e5bfa31e916a47ab980a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 11 17:42:17 2020 +0000
ISIS-2259: fixes issues with mvn versions:set
---
core/pom.xml | 1 -
extensions/security/secman/pom.xml | 6 +++---
mappings/pom.xml | 2 +-
subdomains/pom.xml | 2 +-
testing/pom.xml | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 991efc3..ba62851 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -36,7 +36,6 @@
</description>
<properties>
- <revision>2.0.0-M3-SNAPSHOT</revision>
<isis.skipTests>false</isis.skipTests>
<maven.test.skip>${isis.skipTests}</maven.test.skip>
diff --git a/extensions/security/secman/pom.xml b/extensions/security/secman/pom.xml
index d01ecf6..81faae3 100644
--- a/extensions/security/secman/pom.xml
+++ b/extensions/security/secman/pom.xml
@@ -52,17 +52,17 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-encryption-model</artifactId>
+ <artifactId>isis-extensions-secman-encryption-jbcrypt</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-encryption-persistence-jdo</artifactId>
+ <artifactId>isis-extensions-secman-persistence-jdo</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-encryption-realm-shiro</artifactId>
+ <artifactId>isis-extensions-secman-shiro-realm</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/mappings/pom.xml b/mappings/pom.xml
index 4b241fb..21bbaef 100644
--- a/mappings/pom.xml
+++ b/mappings/pom.xml
@@ -94,7 +94,7 @@
</dependencies>
<modules>
- <module>jaxrsclient/api</module>
+ <module>jaxrsclient</module>
<module>restclient</module>
</modules>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 49ef0f9..13f1139 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -161,7 +161,7 @@
<module>pdfbox</module>
<module>spring</module>
<module>xdocreport</module>
- <module>zip/applib</module>
+ <module>zip</module>
</modules>
<profiles>
diff --git a/testing/pom.xml b/testing/pom.xml
index 3c39dc9..87c62b2 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -76,7 +76,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-hsqldbmgr-ui</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>