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 2019/01/31 06:26:06 UTC
[isis] branch 2033-IoC updated: ISIS-2033: adds new plugin module
'jdo-common'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2033-IoC by this push:
new 8873080 ISIS-2033: adds new plugin module 'jdo-common'
8873080 is described below
commit 887308002ea7206d2246f46d2510825034b9102f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jan 31 07:25:59 2019 +0100
ISIS-2033: adds new plugin module 'jdo-common'
in preparation of decoupling JDO stack from core
Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
.../{jdo-datanucleus-5 => jdo-common}/pom.xml | 48 +++-------------------
core/plugins/jdo-datanucleus-4/pom.xml | 4 +-
core/plugins/jdo-datanucleus-5/pom.xml | 4 +-
core/pom.xml | 7 ++++
4 files changed, 17 insertions(+), 46 deletions(-)
diff --git a/core/plugins/jdo-datanucleus-5/pom.xml b/core/plugins/jdo-common/pom.xml
similarity index 74%
copy from core/plugins/jdo-datanucleus-5/pom.xml
copy to core/plugins/jdo-common/pom.xml
index 1b1e7bf..a2bd6ea 100644
--- a/core/plugins/jdo-datanucleus-5/pom.xml
+++ b/core/plugins/jdo-common/pom.xml
@@ -20,16 +20,16 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
+ <artifactId>isis-core-plugins-jdo-common</artifactId>
- <name>Apache Isis Plugin for JDO (Datanucleus 5)</name>
+ <name>Apache Isis Plugin for JDO (Common)</name>
<description>
- JDO plugin using datanucleus.
+ Common base for JDO plugins.
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.plugins.jdo-datanucleus-5</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/plugins/jdo-datanucleus-5</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.plugins.jdo-common</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/plugins/jdo-common</git-plugin.propertiesDir>
</properties>
<build>
@@ -69,42 +69,6 @@
<dependencies>
- <!-- JDO API (providing compile dependency) -->
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>javax.jdo</artifactId>
- <version>${dn5-jdo-api.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- DataNucleus -->
-
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>${dn5-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-api-jdo</artifactId>
- <version>${dn5-api-jdo.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jdo-query</artifactId>
- <version>${dn5-jdo-query.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-rdbms</artifactId>
- <version>${dn5-rdbms.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jodatime</artifactId>
- <version>${dn5-jodatime.version}</version>
- </dependency>
-
<!-- Core Runtime -->
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -133,7 +97,7 @@
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
-
+
</dependencies>
<profiles>
diff --git a/core/plugins/jdo-datanucleus-4/pom.xml b/core/plugins/jdo-datanucleus-4/pom.xml
index fb9192b..e6bc9ac 100644
--- a/core/plugins/jdo-datanucleus-4/pom.xml
+++ b/core/plugins/jdo-datanucleus-4/pom.xml
@@ -106,10 +106,10 @@
<version>${dn4-jodatime.version}</version>
</dependency>
- <!-- Core Runtime -->
+ <!-- JDO COMMON -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
+ <artifactId>isis-core-plugins-jdo-common</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/core/plugins/jdo-datanucleus-5/pom.xml b/core/plugins/jdo-datanucleus-5/pom.xml
index 1b1e7bf..89665c8 100644
--- a/core/plugins/jdo-datanucleus-5/pom.xml
+++ b/core/plugins/jdo-datanucleus-5/pom.xml
@@ -105,10 +105,10 @@
<version>${dn5-jodatime.version}</version>
</dependency>
- <!-- Core Runtime -->
+ <!-- JDO COMMON -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
+ <artifactId>isis-core-plugins-jdo-common</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index f3ef95a..04aaa52 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1417,6 +1417,12 @@ ${license.additional-notes}
<version>${isis.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jdo-common</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jdo-datanucleus-4</artifactId>
@@ -2530,6 +2536,7 @@ ${license.additional-notes}
<module>plugins/ioc-weld</module>
<module>plugins/jaxrs-resteasy-3</module>
<module>plugins/jaxrs-resteasy-4</module>
+ <module>plugins/jdo-common</module>
<module>plugins/jdo-datanucleus-4</module>
<module>plugins/jdo-datanucleus-5</module>
<module>plugins/security-pac4j</module>