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/08/28 10:43:56 UTC

[isis] branch master updated: ISIS-1841: change DN dependencies scope compile -> runtime

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 8bf592c  ISIS-1841: change DN dependencies scope compile -> runtime
8bf592c is described below

commit 8bf592c7d9d674c2b371d16d87de21218c7c798b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Aug 28 12:43:52 2018 +0200

    ISIS-1841: change DN dependencies scope compile -> runtime
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-1841
    
    Motivation:
    https://stackoverflow.com/questions/877949/conflicting-versions-of-datanucleus-enhancer-in-a-maven-google-app-engine-projec
---
 core/plugins/jdo-datanucleus-4/pom.xml |  9 ++++++++-
 core/plugins/jdo-datanucleus-5/pom.xml | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/plugins/jdo-datanucleus-4/pom.xml b/core/plugins/jdo-datanucleus-4/pom.xml
index 4fdb49b..3c35511 100644
--- a/core/plugins/jdo-datanucleus-4/pom.xml
+++ b/core/plugins/jdo-datanucleus-4/pom.xml
@@ -79,31 +79,38 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<!-- DataNucleus -->
+		<!-- DataNucleus runtime dependencies -->
+		<!-- for why we use scope=runtime see 
+			https://stackoverflow.com/questions/877949/conflicting-versions-of-datanucleus-enhancer-in-a-maven-google-app-engine-projec -->
 		<dependency>
 			<groupId>org.datanucleus</groupId>
 			<artifactId>datanucleus-core</artifactId>
 			<version>${dn4-core.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.datanucleus</groupId>
 			<artifactId>datanucleus-api-jdo</artifactId>
 			<version>${dn4-api-jdo.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.datanucleus</groupId>
 			<artifactId>datanucleus-jdo-query</artifactId>
 			<version>${dn4-jdo-query.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.datanucleus</groupId>
 			<artifactId>datanucleus-rdbms</artifactId>
 			<version>${dn4-rdbms.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.datanucleus</groupId>
 			<artifactId>datanucleus-jodatime</artifactId>
 			<version>${dn4-jodatime.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 
 		<!-- Core Runtime -->
diff --git a/core/plugins/jdo-datanucleus-5/pom.xml b/core/plugins/jdo-datanucleus-5/pom.xml
index 3a67439..ed6c869 100644
--- a/core/plugins/jdo-datanucleus-5/pom.xml
+++ b/core/plugins/jdo-datanucleus-5/pom.xml
@@ -77,32 +77,38 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<!-- DataNucleus -->
-
+		<!-- DataNucleus runtime dependencies -->
+		<!-- for why we use scope=runtime see 
+			https://stackoverflow.com/questions/877949/conflicting-versions-of-datanucleus-enhancer-in-a-maven-google-app-engine-projec -->
 		<dependency>
 			<groupId>org.datanucleus</groupId>
 			<artifactId>datanucleus-core</artifactId>
 			<version>${dn5-core.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.datanucleus</groupId>
 			<artifactId>datanucleus-api-jdo</artifactId>
 			<version>${dn5-api-jdo.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.datanucleus</groupId>
 			<artifactId>datanucleus-jdo-query</artifactId>
 			<version>${dn5-jdo-query.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.datanucleus</groupId>
 			<artifactId>datanucleus-rdbms</artifactId>
 			<version>${dn5-rdbms.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.datanucleus</groupId>
 			<artifactId>datanucleus-jodatime</artifactId>
 			<version>${dn5-jodatime.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 
 		<!-- Core Runtime -->