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:06 UTC
[isis] 02/02: ISIS-2259: fixes issues with mvn versions:set
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>