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 2014/01/10 12:45:03 UTC
git commit: ISIS-646: upgrade to DN 3.3.6
Updated Branches:
refs/heads/master 489fba882 -> 239182f83
ISIS-646: upgrade to DN 3.3.6
Along with workaround for NUCCORE-1103, http://www.datanucleus.org/servlet/jira/browse/NUCCORE-1103
See also https://issues.apache.org/jira/browse/ISIS-647, which is to backout said workaround.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/239182f8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/239182f8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/239182f8
Branch: refs/heads/master
Commit: 239182f83fee1fa8266b700683940cd55b9bbd8a
Parents: 489fba8
Author: Dan Haywood <da...@apache.org>
Authored: Fri Jan 10 11:41:54 2014 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Jan 10 11:41:54 2014 +0000
----------------------------------------------------------------------
component/objectstore/jdo/jdo-applib/pom.xml | 60 +++-----------------
.../objectstore/jdo/jdo-datanucleus/pom.xml | 24 +-------
.../jdo/datanucleus/DataNucleusObjectStore.java | 4 +-
...rsistenceQueryFindAllInstancesProcessor.java | 7 ++-
...tenceQueryFindUsingApplibQueryProcessor.java | 7 +++
.../persistence/queries/QueryUtil.java | 7 ++-
component/objectstore/jdo/jdo-metamodel/pom.xml | 9 +++
component/objectstore/jdo/pom.xml | 40 ++++---------
core/tck/pom.xml | 27 +++++++++
core/tck/tck-dom/pom.xml | 44 ++++----------
.../quickstart_wicket_restful_jdo/dom/pom.xml | 16 +-----
.../quickstart_wicket_restful_jdo/pom.xml | 6 +-
.../simple_wicket_restful_jdo/dom/pom.xml | 16 +-----
.../src/main/java/dom/simple/SimpleObject.java | 2 +
.../simple_wicket_restful_jdo/pom.xml | 4 +-
pom.xml | 34 +++++++++--
16 files changed, 124 insertions(+), 183 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/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 bd9326f..9f88bd7 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -37,40 +37,15 @@
<!-- used in Site generation for relative references. -->
<url>http://isis.apache.org/${relativeUrl}</url>
-
<build>
<plugins>
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
- <version>3.3.0-release</version>
- <dependencies>
- <dependency>
- <!--
- 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 same version of jdo-api
- that's used by the JDO objectstore
- -->
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- </dependency>
- </dependencies>
+ <version>${datanucleus-maven-plugin.version}</version>
<configuration>
<fork>false</fork>
<verbose>true</verbose>
- <!--
- <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
- <props>${basedir}/datanucleus.properties</props>
- -->
</configuration>
<executions>
<execution>
@@ -138,41 +113,22 @@
<artifactId>isis-core-applib</artifactId>
</dependency>
- <!-- DataNucleus (horrid, but needed to run the enhancer)-->
<dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <exclusions>
- <exclusion>
- <!-- use geronimo-jta_1.1_spec instead -->
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
+
+ <!-- DataNucleus (jdo-api, and for enhancer) -->
<dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <scope>runtime</scope>
+ <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jodatime</artifactId>
</dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-api-jdo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/component/objectstore/jdo/jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/pom.xml b/component/objectstore/jdo/jdo-datanucleus/pom.xml
index d33596f..36be7aa 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -64,32 +64,14 @@
<artifactId>reflections</artifactId>
</dependency>
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <exclusions>
- <exclusion>
- <!-- use geronimo-jta_1.1_spec instead -->
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- </dependency>
<dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-api-jdo</artifactId>
+ <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-rdbms</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <artifactId>datanucleus-jodatime</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
index e57d75f..ab2989e 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
@@ -555,10 +555,8 @@ public class DataNucleusObjectStore implements ObjectStoreSpi {
return false;
}
- final Query query = QueryUtil.createQuery(getPersistenceManager(), "o", "select o.id", specification, null);
+ final Query jdoQuery = QueryUtil.createQuery(getPersistenceManager(), "o", "select o.id", specification, null);
throw new NotYetImplementedException();
- //query.set.setMaxResults(1);
- //return !query.getResultList().isEmpty();
}
// ///////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
index 31aab7d..c308cc0 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
@@ -44,13 +44,16 @@ public class PersistenceQueryFindAllInstancesProcessor extends PersistenceQueryP
final ObjectSpecification specification = persistenceQuery.getSpecification();
Class<?> cls = specification.getCorrespondingClass();
- final Query query = getPersistenceManager().newQuery(cls);
+ final Query jdoQuery = getPersistenceManager().newQuery(cls);
+
+ // http://www.datanucleus.org/servlet/jira/browse/NUCCORE-1103
+ jdoQuery.addExtension("datanucleus.multivaluedFetch", "none");
if (LOG.isDebugEnabled()) {
LOG.debug("allInstances(): class=" + specification.getFullIdentifier());
}
- final List<?> pojos = (List<?>) query.execute();
+ final List<?> pojos = (List<?>) jdoQuery.execute();
return loadAdapters(specification, pojos);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
index 03bdf6e..d1c49ef 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
@@ -77,6 +77,9 @@ public class PersistenceQueryFindUsingApplibQueryProcessor extends PersistenceQu
final String pkOtoaId = pkOtoa.getId();
final String filter = pkOtoaId + "==" + map.get(pkOtoaId);
final Query jdoQuery = getPersistenceManager().newQuery(cls, filter);
+
+ // http://www.datanucleus.org/servlet/jira/browse/NUCCORE-1103
+ jdoQuery.addExtension("datanucleus.multivaluedFetch", "none");
if (LOG.isDebugEnabled()) {
LOG.debug("query: " + queryName + ", filter: " + filter);
@@ -95,6 +98,10 @@ public class PersistenceQueryFindUsingApplibQueryProcessor extends PersistenceQu
final PersistenceManager persistenceManager = getJdoObjectStore().getPersistenceManager();
final Class<?> cls = objectSpec.getCorrespondingClass();
final Query jdoQuery = persistenceManager.newNamedQuery(cls, queryName);
+
+ // http://www.datanucleus.org/servlet/jira/browse/NUCCORE-1103
+ jdoQuery.addExtension("datanucleus.multivaluedFetch", "none");
+
if(persistenceQuery.hasRange()) {
jdoQuery.setRange(persistenceQuery.getStart(), persistenceQuery.getEnd());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/QueryUtil.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/QueryUtil.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/QueryUtil.java
index 860bbac..af8e51b 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/QueryUtil.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/QueryUtil.java
@@ -49,7 +49,12 @@ public final class QueryUtil {
LOG.debug("creating query: " + queryString);
}
- return persistenceManager.newQuery(queryString);
+ final Query jdoQuery = persistenceManager.newQuery(queryString);
+
+ // http://www.datanucleus.org/servlet/jira/browse/NUCCORE-1103
+ jdoQuery.addExtension("datanucleus.multivaluedFetch", "none");
+
+ return jdoQuery;
}
private static StringBuilder appendSelect(
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/component/objectstore/jdo/jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/pom.xml b/component/objectstore/jdo/jdo-metamodel/pom.xml
index 2c7a9c4..058b2dc 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -42,6 +42,15 @@
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jodatime</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 9a7640d..8e980f0 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -29,12 +29,13 @@
<packaging>pom</packaging>
<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-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
<datanucleus-jodatime.version>3.2.1</datanucleus-jodatime.version>
-
+ <datanucleus-maven-plugin.version>3.3.2</datanucleus-maven-plugin.version>
+
+ <!-- ensure compatible with version aggregated in datanucleus-accessplatform-jdo-rdbms -->
+ <jdo-api.version>3.1-rc1</jdo-api.version>
+
<siteBaseDir>.</siteBaseDir>
<relativeUrl />
@@ -141,39 +142,18 @@
<!-- DataNucleus -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>3.0.1</version>
- <exclusions>
- <!-- use geronimo-jta_1.1_spec instead -->
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>${datanucleus-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-api-jdo</artifactId>
- <version>${datanucleus-api-jdo.version}</version>
- </dependency>
<dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-rdbms</artifactId>
- <version>${datanucleus-rdbms.version}</version>
+ <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
+ <version>${datanucleus-accessplatform-jdo-rdbms.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jodatime</artifactId>
<version>${datanucleus-jodatime.version}</version>
</dependency>
+
</dependencies>
</dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/core/tck/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/pom.xml b/core/tck/pom.xml
index d2d92c0..5b39739 100644
--- a/core/tck/pom.xml
+++ b/core/tck/pom.xml
@@ -32,6 +32,13 @@
<packaging>pom</packaging>
+ <properties>
+ <!-- must be consistent with the versions defined by the JDO Objectstore -->
+ <datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
+ <datanucleus-maven-plugin.version>3.3.2</datanucleus-maven-plugin.version>
+ <datanucleus-jodatime.version>3.2.1</datanucleus-jodatime.version>
+ </properties>
+
<repositories>
<repository>
<id>apache.snapshots</id>
@@ -136,6 +143,26 @@
</plugin>
</plugins>
</build>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <!-- DataNucleus -->
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
+ <version>${datanucleus-accessplatform-jdo-rdbms.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jodatime</artifactId>
+ <version>${datanucleus-jodatime.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ </dependencyManagement>
<modules>
<module>tck-dom</module>
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/core/tck/tck-dom/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/pom.xml b/core/tck/tck-dom/pom.xml
index b99b953..5da1847 100644
--- a/core/tck/tck-dom/pom.xml
+++ b/core/tck/tck-dom/pom.xml
@@ -42,7 +42,7 @@
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
- <version>3.2.0-release</version>
+ <version>${datanucleus-maven-plugin.version}</version>
<configuration>
<fork>false</fork>
<verbose>true</verbose>
@@ -95,24 +95,6 @@
</plugins>
</pluginManagement>
</build>
- <dependencies>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>3.1.2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-enhancer</artifactId>
- <version>3.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-api-jdo</artifactId>
- <version>3.1.2</version>
- </dependency>
- </dependencies>
</profile>
</profiles>
@@ -121,24 +103,18 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
</dependency>
-
- <!-- necessary, since we have JDO annotations in the code -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>3.0.1</version>
- <exclusions>
- <exclusion>
- <!-- use geronimo-jta_1.1_spec instead -->
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
+
+ <!-- DataNucleus -->
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
+ <type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jodatime</artifactId>
</dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
index 27d5872..fbb3321 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
@@ -50,21 +50,7 @@
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
- <version>3.2.0-release</version>
- <dependencies>
- <dependency>
- <!-- Force the enhancer to use the same version of core as the JDO objectstore -->
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>${datanucleus-core.version}</version>
- </dependency>
- <dependency>
- <!-- Force the enhancer to use the same version of jdo-api as the JDO objectstore -->
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- </dependency>
- </dependencies>
+ <version>${datanucleus-maven-plugin.version}</version>
<configuration>
<fork>false</fork>
<log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/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 9efed63..6337822 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -37,9 +37,9 @@
<isis-security-shiro.version>1.4.0-SNAPSHOT</isis-security-shiro.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
- <datanucleus-core.version>3.2.7</datanucleus-core.version>
- <jdo-api.version>3.0.1</jdo-api.version>
-
+ <datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
+ <datanucleus-maven-plugin.version>3.3.2</datanucleus-maven-plugin.version>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/example/application/simple_wicket_restful_jdo/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/dom/pom.xml b/example/application/simple_wicket_restful_jdo/dom/pom.xml
index 2515e82..477782f 100644
--- a/example/application/simple_wicket_restful_jdo/dom/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/dom/pom.xml
@@ -50,21 +50,7 @@
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
- <version>3.2.0-release</version>
- <dependencies>
- <dependency>
- <!-- Force the enhancer to use the same version of core as the JDO objectstore -->
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>${datanucleus-core.version}</version>
- </dependency>
- <dependency>
- <!-- Force the enhancer to use the same version of jdo-api as the JDO objectstore -->
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- </dependency>
- </dependencies>
+ <version>${datanucleus-maven-plugin.version}</version>
<configuration>
<fork>false</fork>
<log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/example/application/simple_wicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObject.java b/example/application/simple_wicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObject.java
index b48b45d..e93d5b0 100644
--- a/example/application/simple_wicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObject.java
+++ b/example/application/simple_wicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObject.java
@@ -23,6 +23,7 @@ import javax.jdo.annotations.VersionStrategy;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.annotation.Bookmarkable;
+import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.util.ObjectContracts;
@@ -55,6 +56,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
}
+
// //////////////////////////////////////
// compareTo
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/example/application/simple_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/pom.xml b/example/application/simple_wicket_restful_jdo/pom.xml
index 6ab2d2a..2e7101f 100644
--- a/example/application/simple_wicket_restful_jdo/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/pom.xml
@@ -37,8 +37,8 @@
<isis-security-shiro.version>1.4.0-SNAPSHOT</isis-security-shiro.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
- <datanucleus-core.version>3.2.7</datanucleus-core.version>
- <jdo-api.version>3.0.1</jdo-api.version>
+ <datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
+ <datanucleus-maven-plugin.version>3.3.2</datanucleus-maven-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
http://git-wip-us.apache.org/repos/asf/isis/blob/239182f8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7838ae7..f4d0a2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,14 +47,11 @@
</activation>
<modules>
<module>core</module>
-
- <module>component/objectstore/xml</module>
- <module>component/objectstore/nosql</module>
- <module>component/objectstore/jdo</module>
+
<module>component/progmodel/groovy</module>
<module>component/profilestore/xml</module>
-
+
<module>component/security/file</module>
<module>component/security/shiro</module>
@@ -63,6 +60,10 @@
<module>component/viewer/wicket</module>
<module>component/viewer/restfulobjects</module>
+ <module>component/objectstore/xml</module>
+ <module>component/objectstore/nosql</module>
+ <module>component/objectstore/jdo</module>
+
<module>example/application/quickstart_scimpi_nosql</module>
<module>example/application/quickstart_wicket_restful_jdo</module>
<module>example/application/simple_wicket_restful_jdo</module>
@@ -73,6 +74,29 @@
<module>tool/maven-plugin</module>
</modules>
</profile>
+
+ <profile>
+ <id>released</id>
+ <modules>
+ <module>core</module>
+
+ <module>component/security/file</module>
+ <module>component/security/shiro</module>
+
+ <module>component/viewer/wicket</module>
+ <module>component/viewer/restfulobjects</module>
+
+ <module>component/objectstore/jdo</module>
+
+ <module>example/application/quickstart_wicket_restful_jdo</module>
+ <module>example/application/simple_wicket_restful_jdo</module>
+
+ <module>example/archetype/simple_wicket_restful_jdo</module>
+ <module>example/archetype/quickstart_wicket_restful_jdo</module>
+
+ <module>tool/maven-plugin</module>
+ </modules>
+ </profile>
<profile>
<id>sonar</id>