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/06/28 09:40:58 UTC
git commit: ISIS-448: new approach for handling DN updates
Updated Branches:
refs/heads/master 153b091c5 -> 4a2e69c0a
ISIS-448: new approach for handling DN updates
- namely to fix the DN version used by the enhancer, rather than try to use the latest-n-greatest.
- this lets us remove some of the nasty workarounds
- also bumping example poms to 1.0.4-SNAPSHOT (had been left at 1.0.3-SNAPSHOT)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4a2e69c0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4a2e69c0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4a2e69c0
Branch: refs/heads/master
Commit: 4a2e69c0af620c86a2a7e6d0fb689ebfad4118a9
Parents: 153b091
Author: Dan Haywood <da...@apache.org>
Authored: Fri Jun 28 08:35:17 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Jun 28 08:35:17 2013 +0100
----------------------------------------------------------------------
component/objectstore/jdo/jdo-applib/pom.xml | 9 ++++
.../quickstart_wicket_restful_jdo/dom/pom.xml | 45 +++++---------------
.../fixture/pom.xml | 2 +-
.../integtests/pom.xml | 2 +-
.../objstore-jdo/pom.xml | 2 +-
.../quickstart_wicket_restful_jdo/pom.xml | 5 ++-
.../webapp/pom.xml | 2 +-
7 files changed, 27 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4a2e69c0/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 507c736..69c5efd 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -44,6 +44,15 @@
<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 that's already
+ on the classpath -->
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <version>${datanucleus-core.version}</version>
+ </dependency>
+ </dependencies>
<configuration>
<fork>false</fork>
<verbose>true</verbose>
http://git-wip-us.apache.org/repos/asf/isis/blob/4a2e69c0/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 d320043..4769f60 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>quickstart_wicket_restful_jdo</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
<artifactId>quickstart_wicket_restful_jdo-dom</artifactId>
@@ -35,6 +35,15 @@
<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 that's already on the classpath -->
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <version>${datanucleus-core.version}</version>
+ </dependency>
+ </dependencies>
<configuration>
<fork>false</fork>
<log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
@@ -99,21 +108,6 @@
<artifactId>isis-objectstore-jdo-applib</artifactId>
</dependency>
-
- <!-- DataNucleus (horrid, but needed to run the enhancer)-->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-api-jdo</artifactId>
- </dependency>
-
<!--
GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
<dependency>
@@ -123,24 +117,5 @@
-->
</dependencies>
-
- <profiles>
- <profile>
- <id>not-m2e</id>
- <activation>
- <property>
- <name>!m2e.version</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>(3.2.0-m1, 3.2.99)</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/4a2e69c0/example/application/quickstart_wicket_restful_jdo/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/pom.xml b/example/application/quickstart_wicket_restful_jdo/fixture/pom.xml
index f93d466..923ad96 100644
--- a/example/application/quickstart_wicket_restful_jdo/fixture/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>quickstart_wicket_restful_jdo</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
<artifactId>quickstart_wicket_restful_jdo-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/4a2e69c0/example/application/quickstart_wicket_restful_jdo/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/pom.xml b/example/application/quickstart_wicket_restful_jdo/integtests/pom.xml
index 0d6da73..f0a44be 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>quickstart_wicket_restful_jdo</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
<artifactId>quickstart_wicket_restful_jdo-integtests</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/4a2e69c0/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
index 98ef2f4..3350241 100644
--- a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>quickstart_wicket_restful_jdo</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
<artifactId>quickstart_wicket_restful_jdo-objstore-jdo</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/4a2e69c0/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 0d45723..eb23b24 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>quickstart_wicket_restful_jdo</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4-SNAPSHOT</version>
<name>Quickstart Wicket/Restful/JDO App</name>
@@ -36,6 +36,9 @@
<isis-viewer-restfulobjects.version>2.1.0-SNAPSHOT</isis-viewer-restfulobjects.version>
<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>
+
<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/4a2e69c0/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml b/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
index 5695256..a850832 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>quickstart_wicket_restful_jdo</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
<artifactId>quickstart_wicket_restful_jdo-webapp</artifactId>