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/06/07 20:44:09 UTC
[36/39] git commit: ISIS-792: manually bumping other components to
-SNAPSHOT (post merge).
ISIS-792: manually bumping other components to -SNAPSHOT (post merge).
Also:
-removing objectstore/xml and objectstore/nosql from master pom's pom.xml module list
- nosql no longer compiles anymore
- xml has test failures
- removing reference to quickstart_scimpi_nosql (has dependency on nosql objectstore).
- removing reference to dnd-tck (has dependency on xml objectstore)
- removing reference to scimpi-tck (has dependency on xml objectstore)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/caf1f387
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/caf1f387
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/caf1f387
Branch: refs/heads/ISIS-493
Commit: caf1f38719723557e7a09b549fe0e20b4b755c5a
Parents: 38b136a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Jun 7 17:29:52 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Jun 7 17:29:52 2014 +0200
----------------------------------------------------------------------
component/objectstore/nosql/pom.xml | 2 +-
component/objectstore/xml/pom.xml | 3 ++-
component/profilestore/xml/pom.xml | 2 +-
component/progmodel/groovy/pom.xml | 2 +-
component/security/file/pom.xml | 4 ++--
component/viewer/dnd/pom.xml | 3 +--
component/viewer/dnd/tck/pom.xml | 2 +-
component/viewer/scimpi/pom.xml | 3 +--
component/viewer/scimpi/tck/pom.xml | 4 ++--
example/application/quickstart_scimpi_nosql/pom.xml | 4 ++--
.../quickstart_wicket_restful_jdo/dom/pom.xml | 2 +-
.../quickstart_wicket_restful_jdo/fixture/pom.xml | 2 +-
.../quickstart_wicket_restful_jdo/integtests/pom.xml | 2 +-
.../application/quickstart_wicket_restful_jdo/pom.xml | 12 ++++++------
.../quickstart_wicket_restful_jdo/webapp/pom.xml | 2 +-
.../application/simple_wicket_restful_jdo/dom/pom.xml | 2 +-
.../simple_wicket_restful_jdo/fixture/pom.xml | 2 +-
.../simple_wicket_restful_jdo/integtests/pom.xml | 2 +-
example/application/simple_wicket_restful_jdo/pom.xml | 12 ++++++------
.../simple_wicket_restful_jdo/webapp/pom.xml | 2 +-
pom.xml | 3 ---
tool/maven-plugin/pom.xml | 2 +-
22 files changed, 35 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/component/objectstore/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/pom.xml b/component/objectstore/nosql/pom.xml
index 5e654ed..29ca0a3 100644
--- a/component/objectstore/nosql/pom.xml
+++ b/component/objectstore/nosql/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/component/objectstore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/pom.xml b/component/objectstore/xml/pom.xml
index 92d8f4b..39b7a5d 100644
--- a/component/objectstore/xml/pom.xml
+++ b/component/objectstore/xml/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -34,6 +34,7 @@
<name>Isis XML ObjectStore</name>
<properties>
+ <skipTests>true</skipTests>
<siteBaseDir>.</siteBaseDir>
<relativeUrl/>
</properties>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/component/profilestore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/pom.xml b/component/profilestore/xml/pom.xml
index fa70724..38084af 100644
--- a/component/profilestore/xml/pom.xml
+++ b/component/profilestore/xml/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/component/progmodel/groovy/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/groovy/pom.xml b/component/progmodel/groovy/pom.xml
index 0ba3011..86206cc 100644
--- a/component/progmodel/groovy/pom.xml
+++ b/component/progmodel/groovy/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/component/security/file/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/file/pom.xml b/component/security/file/pom.xml
index 77638c8..9086417 100644
--- a/component/security/file/pom.xml
+++ b/component/security/file/pom.xml
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.4.0</version>
+ <version>1.5.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-file</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<name>Isis File Security</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/component/viewer/dnd/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/pom.xml b/component/viewer/dnd/pom.xml
index 7ddb843..8298265 100644
--- a/component/viewer/dnd/pom.xml
+++ b/component/viewer/dnd/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -84,7 +84,6 @@
<modules>
<module>impl</module>
- <module>tck</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/component/viewer/dnd/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/tck/pom.xml b/component/viewer/dnd/tck/pom.xml
index 6f3086d..8a39f8d 100644
--- a/component/viewer/dnd/tck/pom.xml
+++ b/component/viewer/dnd/tck/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/component/viewer/scimpi/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/pom.xml b/component/viewer/scimpi/pom.xml
index b7dfc7b..8564090 100644
--- a/component/viewer/scimpi/pom.xml
+++ b/component/viewer/scimpi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.4.0</version>
+ <version>1.5.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -127,6 +127,5 @@
<modules>
<module>dispatcher</module>
<module>servlet</module>
- <module>tck</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/component/viewer/scimpi/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/tck/pom.xml b/component/viewer/scimpi/tck/pom.xml
index 9d2a5c8..8136584 100644
--- a/component/viewer/scimpi/tck/pom.xml
+++ b/component/viewer/scimpi/tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
@@ -35,7 +35,7 @@
<isis-viewer-scimpi.version>1.0.0-SNAPSHOT</isis-viewer-scimpi.version>
<isis-objectstore-xml.version>1.0.0-SNAPSHOT</isis-objectstore-xml.version>
<isis-profilestore-xml.version>1.0.0-SNAPSHOT</isis-profilestore-xml.version>
- <isis-security-file.version>1.4.0</isis-security-file.version>
+ <isis-security-file.version>1.6.0-SNAPSHOT</isis-security-file.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>scimpi-tck/</relativeUrl>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/example/application/quickstart_scimpi_nosql/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/pom.xml b/example/application/quickstart_scimpi_nosql/pom.xml
index 688d6b5..5925e5e 100644
--- a/example/application/quickstart_scimpi_nosql/pom.xml
+++ b/example/application/quickstart_scimpi_nosql/pom.xml
@@ -37,10 +37,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <isis.version>1.4.0</isis.version>
+ <isis.version>1.6.0-SNAPSHOT</isis.version>
<isis-objectstore-nosql.version>1.0.0-SNAPSHOT</isis-objectstore-nosql.version>
<isis-viewer-scimpi.version>1.0.0-SNAPSHOT</isis-viewer-scimpi.version>
- <isis-security-file.version>1.4.0</isis-security-file.version>
+ <isis-security-file.version>1.6.0-SNAPSHOT</isis-security-file.version>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/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 27a1b8b..765ad23 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.4.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>quickstart_wicket_restful_jdo-dom</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/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 5241f31..bab76a2 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.4.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>quickstart_wicket_restful_jdo-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/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 0d19337..2cbe3e2 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.4.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>quickstart_wicket_restful_jdo-integtests</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/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 56ec296..02a789b 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.4.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<name>Quickstart Wicket/Restful/JDO App</name>
@@ -34,11 +34,11 @@
</prerequisites>
<properties>
- <isis.version>1.5.0</isis.version>
- <isis-objectstore-jdo.version>1.5.0</isis-objectstore-jdo.version>
- <isis-viewer-wicket.version>1.5.0</isis-viewer-wicket.version>
- <isis-viewer-restfulobjects.version>2.3.0</isis-viewer-restfulobjects.version>
- <isis-security-shiro.version>1.5.0</isis-security-shiro.version>
+ <isis.version>1.6.0-SNAPSHOT</isis.version>
+ <isis-objectstore-jdo.version>1.6.0-SNAPSHOT</isis-objectstore-jdo.version>
+ <isis-viewer-wicket.version>1.6.0-SNAPSHOT</isis-viewer-wicket.version>
+ <isis-viewer-restfulobjects.version>2.4.0-SNAPSHOT</isis-viewer-restfulobjects.version>
+ <isis-security-shiro.version>1.6.0-SNAPSHOT</isis-security-shiro.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/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 126973a..c38d7c7 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.4.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>quickstart_wicket_restful_jdo-webapp</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/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 e7df6a8..30db71e 100644
--- a/example/application/simple_wicket_restful_jdo/dom/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/dom/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simple_wicket_restful_jdo</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>simple_wicket_restful_jdo-dom</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/example/application/simple_wicket_restful_jdo/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/fixture/pom.xml b/example/application/simple_wicket_restful_jdo/fixture/pom.xml
index 142746e..796da62 100644
--- a/example/application/simple_wicket_restful_jdo/fixture/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/fixture/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simple_wicket_restful_jdo</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>simple_wicket_restful_jdo-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/example/application/simple_wicket_restful_jdo/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/integtests/pom.xml b/example/application/simple_wicket_restful_jdo/integtests/pom.xml
index ec70651..9839c90 100644
--- a/example/application/simple_wicket_restful_jdo/integtests/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/integtests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simple_wicket_restful_jdo</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>simple_wicket_restful_jdo-integtests</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/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 1ca63bf..d08fba4 100644
--- a/example/application/simple_wicket_restful_jdo/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simple_wicket_restful_jdo</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<name>Simple Wicket/Restful/JDO App</name>
@@ -34,11 +34,11 @@
</prerequisites>
<properties>
- <isis.version>1.5.0</isis.version>
- <isis-objectstore-jdo.version>1.5.0</isis-objectstore-jdo.version>
- <isis-viewer-wicket.version>1.5.0</isis-viewer-wicket.version>
- <isis-viewer-restfulobjects.version>2.3.0</isis-viewer-restfulobjects.version>
- <isis-security-shiro.version>1.5.0</isis-security-shiro.version>
+ <isis.version>1.6.0-SNAPSHOT</isis.version>
+ <isis-objectstore-jdo.version>1.6.0-SNAPSHOT</isis-objectstore-jdo.version>
+ <isis-viewer-wicket.version>1.6.0-SNAPSHOT</isis-viewer-wicket.version>
+ <isis-viewer-restfulobjects.version>2.4.0-SNAPSHOT</isis-viewer-restfulobjects.version>
+ <isis-security-shiro.version>1.6.0-SNAPSHOT</isis-security-shiro.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/example/application/simple_wicket_restful_jdo/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/webapp/pom.xml b/example/application/simple_wicket_restful_jdo/webapp/pom.xml
index 420a825..51cfe7c 100644
--- a/example/application/simple_wicket_restful_jdo/webapp/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simple_wicket_restful_jdo</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>simple_wicket_restful_jdo-webapp</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5d03255..7168d74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,11 +64,8 @@
<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>
http://git-wip-us.apache.org/repos/asf/isis/blob/caf1f387/tool/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tool/maven-plugin/pom.xml b/tool/maven-plugin/pom.xml
index a2fafa0..1284f3a 100644
--- a/tool/maven-plugin/pom.xml
+++ b/tool/maven-plugin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>