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/20 21:52:18 UTC
[1/3] git commit: ISIS-437: updating jdo pom's parent to isis-core
1.3.0
Updated Branches:
refs/heads/prepare/isis-1.3.0-RC1 65396c24d -> 765b1458f
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/prepare/isis-1.3.0-RC1
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>
[2/3] git commit: [maven-release-plugin] prepare release
isis-objectstore-jdo-1.3.0
Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-objectstore-jdo-1.3.0
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/748ef50d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/748ef50d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/748ef50d
Branch: refs/heads/prepare/isis-1.3.0-RC1
Commit: 748ef50d32f47d940193450b9541a4872df71617
Parents: f2d1742
Author: Dan Haywood <da...@apache.org>
Authored: Sun Oct 20 20:37:15 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Sun Oct 20 20:37:15 2013 +0100
----------------------------------------------------------------------
component/objectstore/jdo/jdo-applib/pom.xml | 4 ++--
component/objectstore/jdo/jdo-datanucleus/pom.xml | 2 +-
component/objectstore/jdo/jdo-metamodel/pom.xml | 2 +-
component/objectstore/jdo/pom.xml | 18 +++++++++++-------
4 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/748ef50d/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 b09accf..ec03afe 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<artifactId>isis-objectstore-jdo-applib</artifactId>
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/748ef50d/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 266baf4..cfcd025 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/748ef50d/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 787a4e7..815f375 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</parent>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/748ef50d/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 6cf4dd9..e4dce5b 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0</version>
<name>Isis JDO ObjectStore</name>
@@ -104,36 +104,36 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -176,4 +176,8 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <tag>isis-objectstore-jdo-1.3.0</tag>
+ </scm>
</project>
[3/3] git commit: [maven-release-plugin] prepare for next development
iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/765b1458
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/765b1458
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/765b1458
Branch: refs/heads/prepare/isis-1.3.0-RC1
Commit: 765b1458f1f35ccaf3e901691419df562f628f69
Parents: 748ef50
Author: Dan Haywood <da...@apache.org>
Authored: Sun Oct 20 20:37:25 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Sun Oct 20 20:37:25 2013 +0100
----------------------------------------------------------------------
component/objectstore/jdo/jdo-applib/pom.xml | 4 ++--
component/objectstore/jdo/jdo-datanucleus/pom.xml | 2 +-
component/objectstore/jdo/jdo-metamodel/pom.xml | 2 +-
component/objectstore/jdo/pom.xml | 18 +++++++-----------
4 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/765b1458/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 ec03afe..bd9326f 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-applib</artifactId>
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/765b1458/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 cfcd025..d33596f 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/765b1458/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 815f375..2c7a9c4 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/765b1458/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index e4dce5b..99c16e4 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0-SNAPSHOT</version>
<name>Isis JDO ObjectStore</name>
@@ -104,36 +104,36 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -176,8 +176,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-
- <scm>
- <tag>isis-objectstore-jdo-1.3.0</tag>
- </scm>
</project>