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 a9c5304 ISIS-1893 core/pom.xml: remove jdo-api from managed
dependencies
a9c5304 is described below
commit a9c5304ad72b6dbaa8c3de9aacdc32239ccfb86c
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Tue Mar 6 08:07:18 2018 +0100
ISIS-1893 core/pom.xml: remove jdo-api from managed dependencies
because the jdo-plugins that are responsible for providing the jdo-api
can not override the scope=provided as declared in their parent pom's
managed dependencies (core/pom.xml)
this involes that all other core modules now have to explicitly declare
scope=provided for their jdo-api dependency
---
core/applib-legacy/pom.xml | 3 +++
core/applib/pom.xml | 3 +++
core/integtestsupport/pom.xml | 5 ++++-
core/metamodel/pom.xml | 5 ++++-
core/plugins/jdo-datanucleus-4/pom.xml | 2 ++
core/pom.xml | 16 +++++++++-------
core/runtime/pom.xml | 11 +++++++----
core/unittestsupport/pom.xml | 13 ++++++++-----
core/viewer-restfulobjects-server/pom.xml | 11 +++++++----
core/viewer-wicket-ui/pom.xml | 11 +++++++----
10 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/core/applib-legacy/pom.xml b/core/applib-legacy/pom.xml
index da4a47c..dba1a2e 100644
--- a/core/applib-legacy/pom.xml
+++ b/core/applib-legacy/pom.xml
@@ -58,6 +58,9 @@
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
</dependency>
<!-- LEGACY DEPENDENCY -->
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 9774749..d4f471a 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -110,6 +110,9 @@
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
</dependency>
<!-- HSQL-DB -->
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 0ab6b02..00b1968 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -36,10 +36,13 @@
<dependencies>
- <!-- JDO API (non transient, provided by plugin) -->
+ <!-- JDO API (non transient, provided by plugin) -->
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 515f462..4b0d05e 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -55,10 +55,13 @@
<dependencies>
- <!-- JDO API (non transient, provided by plugin) -->
+ <!-- JDO API (non transient, provided by plugin) -->
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/core/plugins/jdo-datanucleus-4/pom.xml
b/core/plugins/jdo-datanucleus-4/pom.xml
index 90a3b0e..094a00c 100644
--- a/core/plugins/jdo-datanucleus-4/pom.xml
+++ b/core/plugins/jdo-datanucleus-4/pom.xml
@@ -73,6 +73,8 @@
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
+ <!-- intentionally overriding standard compliance version from
parent pom
+ since this plugin is responsible for providing the
'jar' -->
<version>${dn4-jdo-api.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 4274e32..a78f1b9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1168,13 +1168,15 @@ ${license.additional-notes}
</dependency>
<!-- JDO API -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- <!-- provided by plugins -->
- <scope>provided</scope>
- </dependency>
+<!-- not managed, because scope=provided can not be overwritten by plugins
that are
+ responsible for providing jdo-api -->
+<!-- <dependency> -->
+<!-- <groupId>javax.jdo</groupId> -->
+<!-- <artifactId>jdo-api</artifactId> -->
+<!-- <version>${jdo-api.version}</version> -->
+<!-- provided by plugins -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
<!-- unittestsupport -->
<dependency>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index b9f27d7..6beb419 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -56,10 +56,13 @@
<dependencies>
<!-- JDO API (non transient, provided by plugin) -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index a623dfa..62e2e15 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -60,11 +60,14 @@
<artifactId>jmock-junit4</artifactId>
</dependency>
- <!-- JDO API -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- </dependency>
+ <!-- JDO API (non transient, provided by plugin) -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.javassist</groupId>
diff --git a/core/viewer-restfulobjects-server/pom.xml
b/core/viewer-restfulobjects-server/pom.xml
index d8f4a4b..fa75921 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -38,10 +38,13 @@
<dependencies>
<!-- JDO API (non transient, provided by plugin) -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index 0ed115f..fb9abb2 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -63,10 +63,13 @@
<dependencies>
<!-- JDO API (non transient, provided by plugin) -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
--
To stop receiving notification emails like this one, please contact
ahu...@apache.org.
