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/05/15 01:25:48 UTC
git commit: ISIS-406: tidy-up tasks for next release
Updated Branches:
refs/heads/master 9a8c181db -> 55aa57d54
ISIS-406: tidy-up tasks for next release
* updating dependencies to latest version
(though not cglib/asm)
* fixing resultant problem with RO applib/RestEasy/HttpClient4 usage
* now running maven-enforcer plugin everywhere on validate phase
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/55aa57d5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/55aa57d5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/55aa57d5
Branch: refs/heads/master
Commit: 55aa57d54d52d2a187cd60fcd8af1ac89ff64639
Parents: 9a8c181
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 15 00:25:21 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 15 00:25:21 2013 +0100
----------------------------------------------------------------------
.gitignore | 1 +
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 | 19 +-
component/objectstore/nosql/pom.xml | 4 +-
component/objectstore/sql/pom.xml | 2 +-
component/objectstore/sql/sql-tests-common/pom.xml | 2 +-
component/objectstore/sql/sql-tests-served/pom.xml | 4 +-
component/objectstore/xml/pom.xml | 2 +-
component/profilestore/sql/pom.xml | 2 +-
component/profilestore/xml/pom.xml | 2 +-
component/progmodel/groovy/pom.xml | 4 +-
component/progmodel/wrapper/pom.xml | 2 +-
.../progmodel/wrapper/wrapper-metamodel/pom.xml | 4 +-
.../wrapper/metamodel/internal/CgLibProxy.java | 3 +-
component/security/file/pom.xml | 2 +-
component/security/shiro/pom.xml | 4 +-
component/viewer/bdd/concordion/pom.xml | 2 +-
component/viewer/bdd/pom.xml | 2 +-
component/viewer/bdd/tck/pom.xml | 4 +-
component/viewer/dnd/pom.xml | 2 +-
component/viewer/dnd/tck/pom.xml | 2 +-
component/viewer/junit/pom.xml | 2 +-
component/viewer/junit/tck/pom.xml | 2 +-
component/viewer/restfulobjects/applib/pom.xml | 12 +-
.../applib/client/RestfulClient.java | 11 +-
.../applib/client/RestfulResponse.java | 6 +-
component/viewer/restfulobjects/pom.xml | 2 +-
component/viewer/restfulobjects/tck/pom.xml | 7 +-
.../viewer/restfulobjects/tck/RestfulMatchers.java | 54 +++--
.../tck/user/root/Get_thenRepresentation_ok.java | 3 +
component/viewer/scimpi/pom.xml | 2 +-
component/viewer/scimpi/tck/pom.xml | 2 +-
component/viewer/wicket/impl/pom.xml | 2 +-
component/viewer/wicket/model/pom.xml | 2 +-
component/viewer/wicket/pom.xml | 18 +-
component/viewer/wicket/tck/pom.xml | 6 +-
component/viewer/wicket/ui/pom.xml | 2 +-
core/applib/pom.xml | 2 +-
core/bytecode-cglib/pom.xml | 6 +-
core/bytecode-javassist/pom.xml | 2 +-
core/integtestsupport/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/objectstore-inmemory/pom.xml | 2 +-
core/pom.xml | 167 +++++++--------
core/profilestore-inmemory/pom.xml | 2 +-
core/runtime/pom.xml | 2 +-
core/security-noop/pom.xml | 2 +-
core/tck/pom.xml | 2 +-
core/tck/tck-dom/pom.xml | 2 +-
core/tck/tck-fixture/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
example/application/claims/dom/pom.xml | 2 +-
example/application/claims/pom.xml | 4 +-
example/application/claims/viewer-wicket/pom.xml | 2 +-
.../application/quickstart_dnd_junit_bdd/pom.xml | 2 +-
.../application/quickstart_scimpi_nosql/pom.xml | 2 +-
.../objstore-jdo/pom.xml | 2 +-
.../quickstart_wicket_restful_jdo/pom.xml | 6 +-
.../viewer-webapp/pom.xml | 9 +-
.../quickstart_wicket_restful_jdo/pom.xml | 2 +-
example/domain-service/email-service/pom.xml | 8 +-
example/misc/metamodel/namefile/pom.xml | 8 +-
site-skin/pom.xml | 2 +-
tool/maven-plugin/pom.xml | 176 +++++++++++++--
67 files changed, 387 insertions(+), 247 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9c248dd..05c67dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ hs_err_pid*.log
pom.xml.tag
pom.xml.releaseBackup
+pom.xml.versionsBackup
*.jdproj
JArchitectOut/
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/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 18cc481..744e24d 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-applib</artifactId>
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/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 779e6d0..7a25b6d 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/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 8c1cd51..8e2ce72 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index ca23dd1..85e561f 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -16,13 +16,13 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>Isis JDO ObjectStore</name>
@@ -97,43 +97,42 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-metamodel</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
-
<!-- DataNucleus -->
<dependency>
<groupId>javax.jdo</groupId>
@@ -167,7 +166,7 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jodatime</artifactId>
- <version>3.2.0-release</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/objectstore/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/pom.xml b/component/objectstore/nosql/pom.xml
index 1e86890..8ad54e8 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.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -123,7 +123,7 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.10.0</version>
+ <version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/objectstore/sql/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/pom.xml b/component/objectstore/sql/pom.xml
index a9d0d55..1929c6e 100644
--- a/component/objectstore/sql/pom.xml
+++ b/component/objectstore/sql/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/objectstore/sql/sql-tests-common/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-common/pom.xml b/component/objectstore/sql/sql-tests-common/pom.xml
index 79ee65c..829c1e4 100644
--- a/component/objectstore/sql/sql-tests-common/pom.xml
+++ b/component/objectstore/sql/sql-tests-common/pom.xml
@@ -36,7 +36,7 @@
<relativeUrl>sql-tests-common/</relativeUrl>
<xml-objectstore.version>1.0.0-SNAPSHOT</xml-objectstore.version>
- <hsqldb.version>2.2.8</hsqldb.version>
+ <hsqldb.version>2.2.9</hsqldb.version>
</properties>
<!-- used in Site generation for relative references. -->
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/objectstore/sql/sql-tests-served/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-served/pom.xml b/component/objectstore/sql/sql-tests-served/pom.xml
index a274e93..1fc1aef 100644
--- a/component/objectstore/sql/sql-tests-served/pom.xml
+++ b/component/objectstore/sql/sql-tests-served/pom.xml
@@ -35,8 +35,8 @@
<siteBaseDir>..</siteBaseDir>
<relativeUrl>sql-tests-served/</relativeUrl>
- <postgresql.version>9.1-902.jdbc4</postgresql.version>
- <mysql.version>5.1.22</mysql.version>
+ <postgresql.version>9.2-1002.jdbc4</postgresql.version>
+ <mysql.version>5.1.25</mysql.version>
</properties>
<!-- used in Site generation for relative references. -->
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/objectstore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/pom.xml b/component/objectstore/xml/pom.xml
index 637c545..b9f9f16 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.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/profilestore/sql/pom.xml
----------------------------------------------------------------------
diff --git a/component/profilestore/sql/pom.xml b/component/profilestore/sql/pom.xml
index 4420d09..45a37c2 100755
--- a/component/profilestore/sql/pom.xml
+++ b/component/profilestore/sql/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/profilestore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/pom.xml b/component/profilestore/xml/pom.xml
index aaad320..b8cbf2f 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.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/progmodel/groovy/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/groovy/pom.xml b/component/progmodel/groovy/pom.xml
index 06a5692..59f3522 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.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -40,7 +40,7 @@
<siteBaseDir>.</siteBaseDir>
<relativeUrl/>
- <groovy.version>2.0.5</groovy.version>
+ <groovy.version>2.1.3</groovy.version>
</properties>
<!-- used in Site generation for relative references. -->
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/progmodel/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/wrapper/pom.xml b/component/progmodel/wrapper/pom.xml
index 65ea0e1..265c261 100644
--- a/component/progmodel/wrapper/pom.xml
+++ b/component/progmodel/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/progmodel/wrapper/wrapper-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/wrapper/wrapper-metamodel/pom.xml b/component/progmodel/wrapper/wrapper-metamodel/pom.xml
index ed81cd4..48bd674 100644
--- a/component/progmodel/wrapper/wrapper-metamodel/pom.xml
+++ b/component/progmodel/wrapper/wrapper-metamodel/pom.xml
@@ -101,8 +101,8 @@
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/progmodel/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java
----------------------------------------------------------------------
diff --git a/component/progmodel/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java b/component/progmodel/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java
index 2d2cec8..f931d23 100644
--- a/component/progmodel/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java
+++ b/component/progmodel/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java
@@ -55,7 +55,8 @@ public class CgLibProxy<T> {
interfaces.remove(Factory.class); // if there.
interfaces.add(WrapperObject.class);
- return (T) Enhancer.create(origSuperclass, interfaces.toArray(new Class[] {}), new InvocationHandlerMethodInterceptor(handler));
+ InvocationHandlerMethodInterceptor interceptor = new InvocationHandlerMethodInterceptor(handler);
+ return (T) Enhancer.create(origSuperclass, interfaces.toArray(new Class[] {}), interceptor);
}
final Class<T> clazz = (Class<T>) toProxy.getClass();
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/security/file/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/file/pom.xml b/component/security/file/pom.xml
index b1055cf..1306832 100644
--- a/component/security/file/pom.xml
+++ b/component/security/file/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/security/shiro/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/shiro/pom.xml b/component/security/shiro/pom.xml
index 1ea3874..a7c8259 100644
--- a/component/security/shiro/pom.xml
+++ b/component/security/shiro/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -131,7 +131,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.2</version>
+ <version>1.7.5</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/bdd/concordion/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/concordion/pom.xml b/component/viewer/bdd/concordion/pom.xml
index a6e0df9..bbdcd9c 100755
--- a/component/viewer/bdd/concordion/pom.xml
+++ b/component/viewer/bdd/concordion/pom.xml
@@ -33,7 +33,7 @@
<siteBaseDir>..</siteBaseDir>
<relativeUrl>concordion/</relativeUrl>
- <concordion.version>1.4.2</concordion.version>
+ <concordion.version>1.4.3</concordion.version>
</properties>
<!-- used in Site generation for relative references. -->
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/bdd/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/pom.xml b/component/viewer/bdd/pom.xml
index bd3855a..fcb600e 100644
--- a/component/viewer/bdd/pom.xml
+++ b/component/viewer/bdd/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/bdd/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/tck/pom.xml b/component/viewer/bdd/tck/pom.xml
index 7c5d5e8..bf2646e 100644
--- a/component/viewer/bdd/tck/pom.xml
+++ b/component/viewer/bdd/tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
@@ -106,7 +106,7 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.3.03</version>
+ <version>2.0.2</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/dnd/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/pom.xml b/component/viewer/dnd/pom.xml
index 757a5e3..7ae116a 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.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/dnd/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/tck/pom.xml b/component/viewer/dnd/tck/pom.xml
index 7f9aaa3..bea5fc5 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.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/junit/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/junit/pom.xml b/component/viewer/junit/pom.xml
index d96a80b..b90dd62 100644
--- a/component/viewer/junit/pom.xml
+++ b/component/viewer/junit/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/junit/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/junit/tck/pom.xml b/component/viewer/junit/tck/pom.xml
index 102e8dd..b2dca09 100644
--- a/component/viewer/junit/tck/pom.xml
+++ b/component/viewer/junit/tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/restfulobjects/applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/pom.xml b/component/viewer/restfulobjects/applib/pom.xml
index f383669..678e83a 100644
--- a/component/viewer/restfulobjects/applib/pom.xml
+++ b/component/viewer/restfulobjects/applib/pom.xml
@@ -64,14 +64,19 @@
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
-
-
- <!-- TO REMOVE!!! -->
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
</dependency>
+
+ <dependency>
+ <!--
+ required because resteasy-jaxrs declares as a test dependency
+ whereas httpclient4 needs it as a compile dependency -->
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
@@ -81,7 +86,6 @@
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
-
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClient.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClient.java b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClient.java
index 7aa16f5..a46e9e3 100644
--- a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClient.java
+++ b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulClient.java
@@ -23,7 +23,11 @@ import java.net.URI;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.commons.httpclient.HttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.jboss.resteasy.client.ClientExecutor;
+import org.jboss.resteasy.client.ClientRequestFactory;
+import org.jboss.resteasy.client.core.executors.ApacheHttpClient4Executor;
+
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
@@ -33,9 +37,6 @@ import org.apache.isis.viewer.restfulobjects.applib.domaintypes.DomainTypeResour
import org.apache.isis.viewer.restfulobjects.applib.homepage.HomePageResource;
import org.apache.isis.viewer.restfulobjects.applib.user.UserResource;
import org.apache.isis.viewer.restfulobjects.applib.version.VersionResource;
-import org.jboss.resteasy.client.ClientExecutor;
-import org.jboss.resteasy.client.ClientRequestFactory;
-import org.jboss.resteasy.client.core.executors.ApacheHttpClientExecutor;
public class RestfulClient {
@@ -50,7 +51,7 @@ public class RestfulClient {
private final ClientRequestFactory clientRequestFactory;
public RestfulClient(final URI baseUri) {
- this(baseUri, new ApacheHttpClientExecutor(new HttpClient()));
+ this(baseUri, new ApacheHttpClient4Executor(new DefaultHttpClient()));
}
public RestfulClient(final URI baseUri, final ClientExecutor clientExecutor) {
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java
index c137942..4c02e2e 100644
--- a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java
+++ b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java
@@ -294,6 +294,7 @@ public class RestfulResponse<T> {
private final Response response;
private final HttpStatusCode httpStatusCode;
private final Class<T> returnType;
+ private T entity;
@SuppressWarnings({ "rawtypes", "unchecked" })
public static RestfulResponse<JsonRepresentation> of(final Response response) {
@@ -319,7 +320,10 @@ public class RestfulResponse<T> {
}
public T getEntity() throws JsonParseException, JsonMappingException, IOException {
- return JsonMapper.instance().read(response, returnType);
+ if(entity == null) {
+ entity = JsonMapper.instance().read(response, returnType);
+ }
+ return entity;
}
public <V> V getHeader(final Header<V> header) {
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/pom.xml b/component/viewer/restfulobjects/pom.xml
index ca63a9c..cdb9e1b 100644
--- a/component/viewer/restfulobjects/pom.xml
+++ b/component/viewer/restfulobjects/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/restfulobjects/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml
index 9d162d2..43d9c34 100644
--- a/component/viewer/restfulobjects/tck/pom.xml
+++ b/component/viewer/restfulobjects/tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
@@ -104,11 +104,6 @@
<artifactId>isis-core-security</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- </dependency>
-
<!-- to run using WebServer -->
<dependency>
<groupId>org.apache.isis.core</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/RestfulMatchers.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/RestfulMatchers.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/RestfulMatchers.java
index 7044395..aee0ec2 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/RestfulMatchers.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/RestfulMatchers.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.viewer.restfulobjects.tck;
+import java.io.IOException;
+
import javax.ws.rs.core.CacheControl;
import javax.ws.rs.core.MediaType;
@@ -31,9 +33,12 @@ import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.Header;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ActionResultRepresentation;
+import org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.AbstractMatcherBuilder;
import org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.CacheControlMatcherBuilder;
import org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.LinkMatcherBuilder;
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -390,37 +395,46 @@ public class RestfulMatchers {
}
// assertions based on provided criteria
- if (statusCode != null) {
- if (jsonResp.getStatus() != statusCode) {
- return false;
+ try {
+ if (statusCode != null) {
+ if (jsonResp.getStatus() != statusCode) {
+ return false;
+ }
}
- }
- if (selfHref != null) {
- JsonRepresentation entity;
+ if (selfHref != null) {
+ JsonRepresentation entity;
+ try {
+ entity = jsonResp.getEntity();
+ } catch (Exception e) {
+ return false;
+ }
+ if(entity == null) {
+ return false;
+ }
+ LinkRepresentation selfLink = entity.getLink("links[rel=self]");
+ if(selfLink == null) {
+ return false;
+ }
+ if (!selfLink.getHref().equals(selfHref)) {
+ return false;
+ }
+ }
+ return true;
+ } finally {
+ // flush any pending response
try {
- entity = jsonResp.getEntity();
+ jsonResp.getEntity();
} catch (Exception e) {
- return false;
- }
- if(entity == null) {
- return false;
- }
- LinkRepresentation selfLink = entity.getLink("links[rel=self]");
- if(selfLink == null) {
- return false;
- }
- if (!selfLink.getHref().equals(selfHref)) {
- return false;
+ // ignore
}
}
-
- return true;
}
};
}
+
}
public static EntryMatcherBuilder entry(final String key) {
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/user/root/Get_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/user/root/Get_thenRepresentation_ok.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/user/root/Get_thenRepresentation_ok.java
index be70a0f..090dc7d 100644
--- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/user/root/Get_thenRepresentation_ok.java
+++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/user/root/Get_thenRepresentation_ok.java
@@ -40,6 +40,8 @@ import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpS
import org.apache.isis.viewer.restfulobjects.applib.user.UserRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.user.UserResource;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+
+import org.apache.http.util.EntityUtils;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -82,6 +84,7 @@ public class Get_thenRepresentation_ok {
.type(RepresentationType.USER.getMediaType())
.returning(HttpStatusCode.OK)
);
+
assertThat(repr.getUp(), isLink(client)
.rel(Rel.UP)
.href(endsWith(":39393/"))
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/scimpi/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/pom.xml b/component/viewer/scimpi/pom.xml
index ab73f72..ccea900 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.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/scimpi/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/tck/pom.xml b/component/viewer/scimpi/tck/pom.xml
index d77d76b..737f319 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.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml
index c888fed..e0ba49b 100644
--- a/component/viewer/wicket/impl/pom.xml
+++ b/component/viewer/wicket/impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<name>Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml
index 6d18764..a17b8d5 100644
--- a/component/viewer/wicket/model/pom.xml
+++ b/component/viewer/wicket/model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-model</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index c82c835..01dea47 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<name>Isis Wicket Viewer</name>
@@ -102,36 +102,36 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -274,7 +274,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<!-- NOT SURE WHY THIS ISN'T INHERITED -->
- <version>1.7.2</version>
+ <version>1.7.5</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 0901e4d..66c1f06 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -23,19 +23,19 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-tck</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<name>Isis Wicket Viewer TCK tests</name>
<properties>
- <isis-viewer-wicket.version>1.1.1-SNAPSHOT</isis-viewer-wicket.version>
+ <isis-viewer-wicket.version>1.2.0-SNAPSHOT</isis-viewer-wicket.version>
<jetty.version>6.1.4</jetty.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>wicket-tck/</relativeUrl>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/component/viewer/wicket/ui/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/pom.xml b/component/viewer/wicket/ui/pom.xml
index bb5f8b5..b76f9ab 100644
--- a/component/viewer/wicket/ui/pom.xml
+++ b/component/viewer/wicket/ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-ui</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 1ae5c4f..2576184 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/bytecode-cglib/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-cglib/pom.xml b/core/bytecode-cglib/pom.xml
index f023bf1..459f689 100644
--- a/core/bytecode-cglib/pom.xml
+++ b/core/bytecode-cglib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-bytecode-cglib</artifactId>
@@ -75,8 +75,8 @@
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/bytecode-javassist/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-javassist/pom.xml b/core/bytecode-javassist/pom.xml
index 8b32681..be54e40 100644
--- a/core/bytecode-javassist/pom.xml
+++ b/core/bytecode-javassist/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-bytecode-javassist</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 1a57670..f13d81c 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 89411d0..f4375e7 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/objectstore-inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/pom.xml b/core/objectstore-inmemory/pom.xml
index 114ed75..cee6b09 100644
--- a/core/objectstore-inmemory/pom.xml
+++ b/core/objectstore-inmemory/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-objectstore</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index a5a0a2f..64a4f08 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
</parent>
<groupId>org.apache.isis.core</groupId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<artifactId>isis</artifactId>
<packaging>pom</packaging>
@@ -165,10 +165,18 @@ the MIT license [1].
<name>Jeroen van der Wal</name>
<email>jeroen@stromboli.it</email>
<roles>
- <role>pmc</role>
<role>committer</role>
</roles>
- <timezone>+3</timezone>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>madytyoo</id>
+ <name>Maurizio Taverna</name>
+ <email>tavernamaurizio@gmail.com</email>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>+1</timezone>
</developer>
<developer>
<id>mnour</id>
@@ -827,6 +835,41 @@ the MIT license [1].
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[2.2.1,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[1.6.0-11,)</version>
+ </requireJavaVersion>
+ <requirePluginVersions>
+ <message>All plugin versions must be
+ defined!</message>
+ <banLatest>true</banLatest>
+ <banRelease>true</banRelease>
+ </requirePluginVersions>
+ <DependencyConvergence />
+ </rules>
+ </configuration>
+ <!-- goal:enforce supposedly binds to phase:validate,
+ but explicit binding seems to be required -->
+ <executions>
+ <execution>
+ <id>validate-enforce</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
</plugins>
</pluginManagement>
@@ -839,6 +882,11 @@ the MIT license [1].
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
@@ -933,13 +981,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -948,14 +996,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -964,14 +1012,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -980,12 +1028,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -994,26 +1042,26 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-cglib</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-javassist</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<!-- isis-webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<!-- isis-integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1021,24 +1069,24 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-profilestore</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
@@ -1047,17 +1095,17 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-dom</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-fixture</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
@@ -1066,14 +1114,14 @@ ${license.additional-notes}
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.2</version>
+ <version>1.7.5</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -1090,7 +1138,7 @@ ${license.additional-notes}
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -1110,7 +1158,7 @@ ${license.additional-notes}
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>commons-jxpath</groupId>
@@ -1131,7 +1179,7 @@ ${license.additional-notes}
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>13.0.1</version>
+ <version>14.0.1</version>
</dependency>
<!-- Google Guice (dependency injection) -->
@@ -1228,7 +1276,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
- <version>2.3.5.Final</version>
+ <version>2.3.6.Final</version>
<exclusions>
<!-- instead use org.apache.geronimo.specs:geronimo-servlet_2.5_spec -->
<exclusion>
@@ -1331,7 +1379,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.picocontainer</groupId>
<artifactId>picocontainer</artifactId>
- <version>2.14.1</version>
+ <version>2.14.3</version>
</dependency>
<!-- Testing libraries (scope=test) -->
@@ -1719,66 +1767,6 @@ ${license.additional-notes}
</plugins>
</build>
</profile>
-
- <!-- provide ability to switch off enforcer plugin -->
- <profile>
- <id>enforcer-validate</id>
- <activation>
- <property>
- <!-- set by default -->
- <name>isis.enforcer.validate</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.2.1,)</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>[1.6.0-11,)</version>
- </requireJavaVersion>
- <requirePluginVersions>
- <message>All plugin versions must be
- defined!</message>
- <banLatest>true</banLatest>
- <banRelease>true</banRelease>
- </requirePluginVersions>
- <DependencyConvergence />
- </rules>
- </configuration>
- <!-- goal:enforce supposedly binds to phase:validate,
- but explicit binding seems to be required -->
- <executions>
- <execution>
- <id>validate-enforce</id>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- </profile>
-
</profiles>
<modules>
@@ -1800,7 +1788,6 @@ ${license.additional-notes}
<module>tck</module>
</modules>
-
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/profilestore-inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/core/profilestore-inmemory/pom.xml b/core/profilestore-inmemory/pom.xml
index dd7dbb4..93ecdfd 100644
--- a/core/profilestore-inmemory/pom.xml
+++ b/core/profilestore-inmemory/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-profilestore</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index dac4651..02d5473 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/security-noop/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-noop/pom.xml b/core/security-noop/pom.xml
index 3020279..7d587d1 100644
--- a/core/security-noop/pom.xml
+++ b/core/security-noop/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/tck/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/pom.xml b/core/tck/pom.xml
index 7dcd327..277deed 100644
--- a/core/tck/pom.xml
+++ b/core/tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-tck</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/tck/tck-dom/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/pom.xml b/core/tck/tck-dom/pom.xml
index 17f678f..5defb7f 100644
--- a/core/tck/tck-dom/pom.xml
+++ b/core/tck/tck-dom/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-tck-dom</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/tck/tck-fixture/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/pom.xml b/core/tck/tck-fixture/pom.xml
index a2e0300..ca0ad4d 100644
--- a/core/tck/tck-fixture/pom.xml
+++ b/core/tck/tck-fixture/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-tck-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index fd2fabc..f0b9bc2 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index f54f679..c74500d 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/example/application/claims/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/dom/pom.xml b/example/application/claims/dom/pom.xml
index aa522c4..9d18470 100644
--- a/example/application/claims/dom/pom.xml
+++ b/example/application/claims/dom/pom.xml
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/example/application/claims/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/pom.xml b/example/application/claims/pom.xml
index f724dd8..60110fb 100644
--- a/example/application/claims/pom.xml
+++ b/example/application/claims/pom.xml
@@ -26,12 +26,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <isis.version>1.1.1-SNAPSHOT</isis.version>
+ <isis.version>1.2.0-SNAPSHOT</isis.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.0.1-SNAPSHOT</isis-security-file.version>
<isis-viewer-dnd.version>1.0.0-SNAPSHOT</isis-viewer-dnd.version>
- <isis-viewer-wicket.version>1.1.1-SNAPSHOT</isis-viewer-wicket.version>
+ <isis-viewer-wicket.version>1.2.0-SNAPSHOT</isis-viewer-wicket.version>
<isis-viewer-junit.version>1.0.0-SNAPSHOT</isis-viewer-junit.version>
<isis-viewer-scimpi.version>1.0.0-SNAPSHOT</isis-viewer-scimpi.version>
</properties>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/example/application/claims/viewer-wicket/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-wicket/pom.xml b/example/application/claims/viewer-wicket/pom.xml
index e3ab6c5..4958303 100644
--- a/example/application/claims/viewer-wicket/pom.xml
+++ b/example/application/claims/viewer-wicket/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<!-- isis runtime -->
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/example/application/quickstart_dnd_junit_bdd/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_dnd_junit_bdd/pom.xml b/example/application/quickstart_dnd_junit_bdd/pom.xml
index 0f0004e..4596c2e 100644
--- a/example/application/quickstart_dnd_junit_bdd/pom.xml
+++ b/example/application/quickstart_dnd_junit_bdd/pom.xml
@@ -34,7 +34,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <isis.version>1.1.1-SNAPSHOT</isis.version>
+ <isis.version>1.2.0-SNAPSHOT</isis.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-viewer-bdd.version>1.0.0-SNAPSHOT</isis-viewer-bdd.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/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 9f14098..3feca0d 100644
--- a/example/application/quickstart_scimpi_nosql/pom.xml
+++ b/example/application/quickstart_scimpi_nosql/pom.xml
@@ -33,7 +33,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <isis.version>1.1.1-SNAPSHOT</isis.version>
+ <isis.version>1.2.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.0.1-SNAPSHOT</isis-security-file.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/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 1ca9bfd..98ef2f4 100644
--- a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
+ <version>1.7.5</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/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 5621971..fee1328 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -30,9 +30,9 @@
<packaging>pom</packaging>
<properties>
- <isis.version>1.1.1-SNAPSHOT</isis.version>
- <isis-objectstore-jdo.version>1.0.1-SNAPSHOT</isis-objectstore-jdo.version>
- <isis-viewer-wicket.version>1.1.1-SNAPSHOT</isis-viewer-wicket.version>
+ <isis.version>1.2.0-SNAPSHOT</isis.version>
+ <isis-objectstore-jdo.version>1.1.0-SNAPSHOT</isis-objectstore-jdo.version>
+ <isis-viewer-wicket.version>1.2.0-SNAPSHOT</isis-viewer-wicket.version>
<isis-viewer-restfulobjects.version>2.0.0-SNAPSHOT</isis-viewer-restfulobjects.version>
<isis-security-shiro.version>1.1.1-SNAPSHOT</isis-security-shiro.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/example/application/quickstart_wicket_restful_jdo/viewer-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/pom.xml b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/pom.xml
index ec0809f..ee21dab 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/pom.xml
@@ -156,8 +156,7 @@
<artifactId>quickstart_wicket_restful_jdo-dom</artifactId>
<exclusions>
<exclusion>
- <!-- so don't pick up transitive dependency to asm 4.0.0, which is
- incompatible with asm 3.3.1 as used by guice -->
+ <!-- so don't pick up transitive dependency to asm 4.0.0 -->
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-enhancer</artifactId>
</exclusion>
@@ -168,8 +167,7 @@
<artifactId>quickstart_wicket_restful_jdo-fixture</artifactId>
<exclusions>
<exclusion>
- <!-- so don't pick up transitive dependency to asm 4.0.0, which is
- incompatible with asm 3.3.1 as used by guice -->
+ <!-- so don't pick up transitive dependency to asm 4.0.0 -->
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-enhancer</artifactId>
</exclusion>
@@ -182,8 +180,7 @@
<artifactId>quickstart_wicket_restful_jdo-objstore-jdo</artifactId>
<exclusions>
<exclusion>
- <!-- so don't pick up transitive dependency to asm 4.0.0, which is
- incompatible with asm 3.3.1 as used by guice -->
+ <!-- so don't pick up transitive dependency to asm 4.0.0 -->
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-enhancer</artifactId>
</exclusion>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/example/archetype/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
index 526993c..41a94cf 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
@@ -44,7 +44,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/example/domain-service/email-service/pom.xml
----------------------------------------------------------------------
diff --git a/example/domain-service/email-service/pom.xml b/example/domain-service/email-service/pom.xml
index f20d580..676a987 100644
--- a/example/domain-service/email-service/pom.xml
+++ b/example/domain-service/email-service/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <isis.version>1.1.1-SNAPSHOT</isis.version>
+ <isis.version>1.2.0-SNAPSHOT</isis.version>
</properties>
<groupId>org.apache.isis.example.domainservice</groupId>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
- <version>1.1</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
- <groupId>velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.5</version>
+ <version>1.7</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/example/misc/metamodel/namefile/pom.xml
----------------------------------------------------------------------
diff --git a/example/misc/metamodel/namefile/pom.xml b/example/misc/metamodel/namefile/pom.xml
index 3f5b352..d55f5e8 100644
--- a/example/misc/metamodel/namefile/pom.xml
+++ b/example/misc/metamodel/namefile/pom.xml
@@ -23,7 +23,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <isis.version>1.1.1-SNAPSHOT</isis.version>
+ <isis.version>1.2.0-SNAPSHOT</isis.version>
</properties>
<build>
@@ -58,12 +58,12 @@
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
- <version>2.5.1</version>
+ <version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
- <version>2.5.1</version>
+ <version>2.6.0</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-legacy</artifactId>
- <version>2.5.1</version>
+ <version>2.6.0</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/site-skin/pom.xml
----------------------------------------------------------------------
diff --git a/site-skin/pom.xml b/site-skin/pom.xml
index f9e41e3..4fde5cd 100644
--- a/site-skin/pom.xml
+++ b/site-skin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/55aa57d5/tool/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tool/maven-plugin/pom.xml b/tool/maven-plugin/pom.xml
index 4084ad0..05681ac 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.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
@@ -19,14 +19,9 @@
<url>http://maven.apache.org</url>
<prerequisites>
- <maven>2.0.9</maven>
+ <maven>3.0.4</maven>
</prerequisites>
- <properties>
- <isis-parent.enforcer.validate>false</isis-parent.enforcer.validate>
- <mavenVersion>2.0.9</mavenVersion>
- </properties>
-
<build>
<pluginManagement>
<plugins>
@@ -56,7 +51,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.2</version>
<configuration>
<goalPrefix>configurator</goalPrefix>
</configuration>
@@ -109,43 +103,183 @@
<artifactId>isis-core-runtime</artifactId>
</dependency>
+
+ <!--
+ all the plethora of exclusions in the following dependencies
+ are to ensure dependency convergence.
+
+ In some cases, what would have been a transitive dependency
+ is added as a direct dependency in order that it's divergent dependency
+ can be excluded.
+
+ It's all a bit of a pigs' ear...
+ -->
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0</version>
+ <version>3.0.5</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>3.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>3.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model-builder</artifactId>
+ <version>3.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>3.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>${mavenVersion}</version>
+ <version>3.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>${mavenVersion}</version>
+ <version>3.0-alpha-2</version>
+ <exclusions>
+ <!-- for dependency convergence -->
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>${mavenVersion}</version>
+ <artifactId>maven-compat</artifactId>
+ <version>3.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.5.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-sec-dispatcher</artifactId>
+ <version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
- <version>${mavenVersion}</version>
+ <version>3.0-alpha-2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>