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/09/26 18:25:34 UTC
git commit: ISIS-477: upgrading DN to core 3.2.7 etc
Updated Branches:
refs/heads/master 98fa9f2d9 -> ca69baae0
ISIS-477: upgrading DN to core 3.2.7 etc
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ca69baae
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ca69baae
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ca69baae
Branch: refs/heads/master
Commit: ca69baae02df70bddbad85763f600c58b8c422a4
Parents: 98fa9f2
Author: Dan Haywood <da...@apache.org>
Authored: Thu Sep 26 16:26:42 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Sep 26 16:26:42 2013 +0100
----------------------------------------------------------------------
component/objectstore/jdo/jdo-applib/pom.xml | 2 +-
.../jdo/datanucleus/JDOStateManagerForIsis.java | 3 ++-
component/objectstore/jdo/pom.xml | 16 +++-------------
example/application/claims/pom.xml | 2 +-
.../quickstart_wicket_restful_jdo/pom.xml | 2 +-
5 files changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ca69baae/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 df3cbe9..024eaed 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
- <version>3.2.0-release</version>
+ <version>3.3.0-release</version>
<dependencies>
<dependency>
<!-- Force the enhancer to use the same version of core that's already
http://git-wip-us.apache.org/repos/asf/isis/blob/ca69baae/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
index 9af351c..e1c660a 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
@@ -27,6 +27,7 @@ import org.datanucleus.cache.CachedPC;
import org.datanucleus.metadata.AbstractClassMetaData;
import org.datanucleus.state.JDOStateManager;
import org.datanucleus.state.ObjectProvider;
+import org.datanucleus.state.ReferentialJDOStateManager;
import org.datanucleus.store.FieldValues;
import org.datanucleus.store.fieldmanager.FieldManager;
@@ -34,7 +35,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo;
-public class JDOStateManagerForIsis extends JDOStateManager implements StateManager, ObjectProvider {
+public class JDOStateManagerForIsis extends ReferentialJDOStateManager implements StateManager, ObjectProvider {
public JDOStateManagerForIsis(ExecutionContext ec, AbstractClassMetaData cmd) {
super(ec, cmd);
http://git-wip-us.apache.org/repos/asf/isis/blob/ca69baae/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 05a3542..618e28b 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -29,9 +29,9 @@
<packaging>pom</packaging>
<properties>
- <datanucleus-core.version>3.2.4</datanucleus-core.version>
- <datanucleus-api-jdo.version>3.2.3</datanucleus-api-jdo.version>
- <datanucleus-rdbms.version>3.2.3</datanucleus-rdbms.version>
+ <datanucleus-core.version>3.2.7</datanucleus-core.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>
<siteBaseDir>.</siteBaseDir>
@@ -188,14 +188,4 @@
</dependencies>
</dependencyManagement>
-
- <profiles>
- <profile>
- <id>apache-release</id>
- <properties>
- <!-- workaround for http://jira.codehaus.org/browse/MRRESOURCES-58 -->
- <datanucleus.version>3.2.3</datanucleus.version>
- </properties>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/ca69baae/example/application/claims/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/pom.xml b/example/application/claims/pom.xml
index 84a4644..b01af39 100644
--- a/example/application/claims/pom.xml
+++ b/example/application/claims/pom.xml
@@ -33,7 +33,7 @@
<isis-viewer-dnd.version>1.0.0-SNAPSHOT</isis-viewer-dnd.version>
<isis-viewer-wicket.version>1.3.0-SNAPSHOT</isis-viewer-wicket.version>
<isis-viewer-scimpi.version>1.0.0-SNAPSHOT</isis-viewer-scimpi.version>
- <datanucleus-core.version>3.2.4</datanucleus-core.version>
+ <datanucleus-core.version>3.2.7</datanucleus-core.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/isis/blob/ca69baae/example/application/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/pom.xml
index c1279da..1c76d38 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -37,7 +37,7 @@
<isis-security-shiro.version>1.1.1</isis-security-shiro.version>
<!-- must be consistent with the version defined by the JDO Objecstore -->
- <datanucleus-core.version>3.2.4</datanucleus-core.version>
+ <datanucleus-core.version>3.2.7</datanucleus-core.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>