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/05 06:56:11 UTC
[isis] branch master updated: ISIS-1893 make jdo-api transient
(scope=provided)
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 4d08fcf ISIS-1893 make jdo-api transient (scope=provided)
4d08fcf is described below
commit 4d08fcf14c66607da518ba864d7e997f777b8d48
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 5 07:56:07 2018 +0100
ISIS-1893 make jdo-api transient (scope=provided)
let only jdo plugins provide jdo-api (scope=compile)
to prevent jdo version clash 3.1 vs 3.2 in domain code
---
core/applib-legacy/pom.xml | 6 ++++++
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml | 7 +++++++
core/metamodel/pom.xml | 7 +++++++
core/plugins/jdo-datanucleus-4/pom.xml | 15 +++++++--------
core/plugins/jdo-datanucleus-5/pom.xml | 5 ++++-
core/pom.xml | 2 ++
core/runtime/pom.xml | 9 ++++++++-
core/viewer-restfulobjects-server/pom.xml | 6 ++++++
core/viewer-wicket-ui/pom.xml | 6 ++++++
10 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/core/applib-legacy/pom.xml b/core/applib-legacy/pom.xml
index 1ad2b34..da4a47c 100644
--- a/core/applib-legacy/pom.xml
+++ b/core/applib-legacy/pom.xml
@@ -53,6 +53,12 @@
</build>
<dependencies>
+
+ <!-- JDO API (non transient, provided by plugin) -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ </dependency>
<!-- LEGACY DEPENDENCY -->
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 4fcc2a6..9774749 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -106,7 +106,7 @@
<artifactId>javaee-api</artifactId>
</dependency>
- <!-- JDO API -->
+ <!-- JDO API (non transient, provided by plugin) -->
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 50e15c1..0ab6b02 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -35,6 +35,13 @@
</properties>
<dependencies>
+
+ <!-- JDO API (non transient, provided by plugin) -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 4d76471..515f462 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -54,6 +54,13 @@
</build>
<dependencies>
+
+ <!-- JDO API (non transient, provided by plugin) -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
diff --git a/core/plugins/jdo-datanucleus-4/pom.xml b/core/plugins/jdo-datanucleus-4/pom.xml
index 79ef11d..8a0a171 100644
--- a/core/plugins/jdo-datanucleus-4/pom.xml
+++ b/core/plugins/jdo-datanucleus-4/pom.xml
@@ -69,15 +69,14 @@
<dependencies>
- <!-- DataNucleus -->
-
-<!-- inherit from standard API -->
-<!-- <dependency> -->
-<!-- <groupId>org.datanucleus</groupId> -->
-<!-- <artifactId>javax.jdo</artifactId> -->
-<!-- <version>${dn4-jdo-api.version}</version> -->
-<!-- </dependency> -->
+ <!-- JDO API (providing compile dependency) -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${dn4-jdo-api.version}</version>
+ </dependency>
+ <!-- DataNucleus -->
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
diff --git a/core/plugins/jdo-datanucleus-5/pom.xml b/core/plugins/jdo-datanucleus-5/pom.xml
index 98366e5..8bf6954 100644
--- a/core/plugins/jdo-datanucleus-5/pom.xml
+++ b/core/plugins/jdo-datanucleus-5/pom.xml
@@ -69,12 +69,15 @@
<dependencies>
- <!-- DataNucleus -->
+ <!-- JDO API (providing compile dependency) -->
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>javax.jdo</artifactId>
<version>${dn5-jdo-api.version}</version>
</dependency>
+
+ <!-- DataNucleus -->
+
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 1026f4c..4274e32 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1172,6 +1172,8 @@ ${license.additional-notes}
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
<version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
</dependency>
<!-- unittestsupport -->
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 25b9e5a..b9f27d7 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -52,8 +52,15 @@
</resource>
</resources>
</build>
-
+
<dependencies>
+
+ <!-- JDO API (non transient, provided by plugin) -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 32d8bff..d8f4a4b 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -37,6 +37,12 @@
<dependencies>
+ <!-- JDO API (non transient, provided by plugin) -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index 9e38170..0ed115f 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -61,6 +61,12 @@
</build>
<dependencies>
+
+ <!-- JDO API (non transient, provided by plugin) -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.