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 2013/10/25 13:45:18 UTC

[03/28] git commit: ISIS-437: updating jdo pom's parent to isis-core 1.3.0

ISIS-437: updating jdo pom's parent to isis-core 1.3.0

in addition:
- parameterized the use of jdo-api rather than hard-code (similar to the examples/application


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f2d17422
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f2d17422
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f2d17422

Branch: refs/heads/master
Commit: f2d174220bcf5a8fe8e5b10b17fc087a9d2cb626
Parents: 65396c2
Author: Dan Haywood <da...@apache.org>
Authored: Sun Oct 20 20:28:38 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Sun Oct 20 20:28:38 2013 +0100

----------------------------------------------------------------------
 component/objectstore/jdo/jdo-applib/pom.xml | 14 +++++++++-----
 component/objectstore/jdo/pom.xml            |  3 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/f2d17422/component/objectstore/jdo/jdo-applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/pom.xml b/component/objectstore/jdo/jdo-applib/pom.xml
index 024eaed..b09accf 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -46,18 +46,22 @@
                 <version>3.3.0-release</version>
                 <dependencies>
                     <dependency>
-                        <!-- Force the enhancer to use the same version of core that's already
-                                on the classpath -->
+                        <!-- 
+                        Force the enhancer to use the same version of core 
+                        that's used by the JDO objectstore
+                        -->
                         <groupId>org.datanucleus</groupId>
                         <artifactId>datanucleus-core</artifactId>
                         <version>${datanucleus-core.version}</version>
                     </dependency>
                     <dependency>
-                        <!-- Force the enhancer to use the "jdo-api" released "3.0.1" version instead 
-                                of the "3.0.1-SNAPSHOT" version -->
+                        <!-- 
+                        Force the enhancer to use the same version of jdo-api
+                        that's used by the JDO objectstore
+                        -->
                         <groupId>javax.jdo</groupId>
                         <artifactId>jdo-api</artifactId>
-                        <version>3.0.1</version>
+                        <version>${jdo-api.version}</version>
                     </dependency>
                 </dependencies>
                 <configuration>

http://git-wip-us.apache.org/repos/asf/isis/blob/f2d17422/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index ebb8df6..6cf4dd9 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
 		<relativePath>../../../core/pom.xml</relativePath>
 	</parent>
 
@@ -30,6 +30,7 @@
 
 	<properties>
         <datanucleus-core.version>3.2.7</datanucleus-core.version>
+        <jdo-api.version>3.0.1</jdo-api.version>
         <datanucleus-rdbms.version>3.2.6</datanucleus-rdbms.version>
         <datanucleus-api-jdo.version>3.2.4</datanucleus-api-jdo.version>
         <datanucleus-jodatime.version>3.2.1</datanucleus-jodatime.version>