Author: danhaywood
Date: Thu Nov 29 16:02:37 2012
New Revision: 1415225
URL: http://svn.apache.org/viewvc?rev=1415225&view=rev
Log:
ISIS-188: updating dependencies to latest versions
Modified:
isis/trunk/framework/applib/pom.xml
isis/trunk/framework/applib/src/test/java/org/apache/isis/applib/fixtures/FixtureClockInstantiationTest.java
isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
isis/trunk/framework/pom.xml
isis/trunk/framework/progmodels/groovy/pom.xml
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/objstore-jdo/pom.xml
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-html/pom.xml
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-restfulobjects/pom.xml
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-scimpi/pom.xml
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-wicket/pom.xml
isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml
isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml
isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml
isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/pom.xml
isis/trunk/framework/runtimes/dflt/pom.xml
isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/MultiUserExplorationSessionTest.java
isis/trunk/framework/viewer/bdd/common/pom.xml
isis/trunk/framework/viewer/bdd/concordion/pom.xml
isis/trunk/framework/viewer/bdd/pom.xml
isis/trunk/framework/viewer/pom.xml
isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml
isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_xrofollowlinks.java
isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
isis/trunk/framework/viewer/wicket/pom.xml
isis/trunk/framework/viewer/wicket/wicket-viewer/pom.xml
Modified: isis/trunk/framework/applib/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/applib/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/applib/pom.xml (original)
+++ isis/trunk/framework/applib/pom.xml Thu Nov 29 16:02:37 2012
@@ -88,7 +88,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>1.6.2</version>
+ <version>2.1</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified:
isis/trunk/framework/applib/src/test/java/org/apache/isis/applib/fixtures/FixtureClockInstantiationTest.java
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/applib/src/test/java/org/apache/isis/applib/fixtures/FixtureClockInstantiationTest.java?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/applib/src/test/java/org/apache/isis/applib/fixtures/FixtureClockInstantiationTest.java
(original)
+++
isis/trunk/framework/applib/src/test/java/org/apache/isis/applib/fixtures/FixtureClockInstantiationTest.java
Thu Nov 29 16:02:37 2012
@@ -19,6 +19,7 @@
package org.apache.isis.applib.fixtures;
+import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -37,7 +38,7 @@ public class FixtureClockInstantiationTe
@Test
public void shouldSetupClockSingletonWithFixtureClockWhenInitialize() {
FixtureClock.initialize();
- assertThat(Clock.getInstance(), is(FixtureClock.class));
+ assertThat(Clock.getInstance(), is(instanceOf(FixtureClock.class)));
}
@Test
Modified:
isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
(original)
+++
isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
Thu Nov 29 16:02:37 2012
@@ -26,18 +26,17 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
+import org.apache.isis.core.commons.lang.StringUtils;
import org.hamcrest.CoreMatchers;
import org.hamcrest.Description;
import org.hamcrest.Factory;
import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
import org.hamcrest.TypeSafeMatcher;
import org.hamcrest.core.IsEqual;
-import org.hamcrest.number.IsGreaterThan;
-import org.hamcrest.text.StringContains;
-import org.hamcrest.text.StringEndsWith;
-import org.hamcrest.text.StringStartsWith;
-
-import org.apache.isis.core.commons.lang.StringUtils;
+import org.hamcrest.core.StringContains;
+import org.hamcrest.core.StringEndsWith;
+import org.hamcrest.core.StringStartsWith;
/**
* Hamcrest {@link Matcher} implementations.
@@ -82,7 +81,7 @@ public final class IsisMatchers {
}
@Factory
- public static Matcher<String> startsWithStripNewLines(final String
expected) {
+ public static StringStartsWith startsWithStripNewLines(final String
expected) {
final String strippedExpected = StringUtils.stripNewLines(expected);
return new StringStartsWith(strippedExpected) {
@Override
@@ -172,7 +171,7 @@ public final class IsisMatchers {
@Factory
public static <T extends Comparable<T>> Matcher<T> greaterThan(final T c) {
- return new IsGreaterThan<T>(c);
+ return Matchers.greaterThan(c);
}
@Factory
Modified: isis/trunk/framework/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/pom.xml (original)
+++ isis/trunk/framework/pom.xml Thu Nov 29 16:02:37 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>12</version>
</parent>
<groupId>org.apache.isis</groupId>
@@ -301,6 +301,9 @@
<banLatest>true</banLatest>
<banRelease>true</banRelease>
</requirePluginVersions>
+ <!--
+ <DependencyConvergence/>
+ -->
</rules>
</configuration>
<!-- goal:enforce supposedly binds to phase:validate,
@@ -1122,12 +1125,12 @@ archetype includes this explicit depende
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
+ <version>1.7.2</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
</dependency>
<!-- Apache Commons -->
@@ -1159,7 +1162,7 @@ archetype includes this explicit depende
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>commons-jxpath</groupId>
@@ -1171,7 +1174,7 @@ archetype includes this explicit depende
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>11.0.2</version>
+ <version>13.0.1</version>
</dependency>
<!-- Google Guice (dependency injection) -->
@@ -1200,7 +1203,7 @@ archetype includes this explicit depende
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.8.0.GA</version>
+ <version>3.12.1.GA</version>
</dependency>
<!-- XML libraries -->
@@ -1212,24 +1215,24 @@ archetype includes this explicit depende
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>1.4</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
- <version>1.1</version>
+ <version>2.0.2</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.3.2</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3.1</version>
- </dependency>
<!-- JSON libraries -->
@@ -1241,23 +1244,23 @@ archetype includes this explicit depende
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.9.3</version>
+ <version>1.9.11</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.3</version>
+ <version>1.9.11</version>
</dependency>
- <!-- Databases -->
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
- <scope>test</scope>
- </dependency>
-
+ <!-- Databases -->
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>2.2.9</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- RestEasy -->
<dependency>
@@ -1287,12 +1290,12 @@ archetype includes this explicit depende
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
</dependency>
<!-- Web development -->
@@ -1316,7 +1319,7 @@ archetype includes this explicit depende
<dependency>
<groupId>org.htmlparser</groupId>
<artifactId>htmlparser</artifactId>
- <version>1.6</version>
+ <version>2.1</version>
<exclusions>
<exclusion>
<groupId>com.sun</groupId>
@@ -1329,7 +1332,7 @@ archetype includes this explicit depende
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
</dependency>
<dependency>
@@ -1379,7 +1382,7 @@ archetype includes this explicit depende
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>1.6.2</version>
+ <version>2.1</version>
</dependency>
<!-- Specs -->
Modified: isis/trunk/framework/progmodels/groovy/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/progmodels/groovy/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/progmodels/groovy/pom.xml (original)
+++ isis/trunk/framework/progmodels/groovy/pom.xml Thu Nov 29 16:02:37 2012
@@ -38,7 +38,7 @@
<siteBaseDir>../..</siteBaseDir>
<relativeUrl>progmodels/groovy/</relativeUrl>
- <groovy.version>1.7.2</groovy.version>
+ <groovy.version>2.0.5</groovy.version>
</properties>
<!-- used in Site generation for relative references. -->
Modified:
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/objstore-jdo/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/objstore-jdo/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/objstore-jdo/pom.xml
(original)
+++
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/objstore-jdo/pom.xml
Thu Nov 29 16:02:37 2012
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
+ <version>1.7.2</version>
</dependency>
</dependencies>
Modified:
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
Thu Nov 29 16:02:37 2012
@@ -442,7 +442,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>4.11</version>
</dependency>
Modified:
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-html/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-html/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-html/pom.xml
(original)
+++
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-html/pom.xml
Thu Nov 29 16:02:37 2012
@@ -180,7 +180,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.2.8</version>
+ <version>2.2.9</version>
</dependency>
<!--
Modified:
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-restfulobjects/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-restfulobjects/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-restfulobjects/pom.xml
(original)
+++
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-restfulobjects/pom.xml
Thu Nov 29 16:02:37 2012
@@ -175,7 +175,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.2.8</version>
+ <version>2.2.9</version>
</dependency>
<!--
Modified:
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-scimpi/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-scimpi/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-scimpi/pom.xml
(original)
+++
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-scimpi/pom.xml
Thu Nov 29 16:02:37 2012
@@ -176,7 +176,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.2.8</version>
+ <version>2.2.9</version>
</dependency>
<!--
Modified:
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-wicket/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-wicket/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-wicket/pom.xml
(original)
+++
isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-wicket/pom.xml
Thu Nov 29 16:02:37 2012
@@ -178,7 +178,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.2.8</version>
+ <version>2.2.9</version>
</dependency>
<!--
Modified:
isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
(original)
+++
isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
Thu Nov 29 16:02:37 2012
@@ -3,8 +3,6 @@ package org.apache.isis.runtimes.dflt.ob
import java.util.List;
import java.util.Map;
-import javax.annotation.Nullable;
-
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
Modified: isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml (original)
+++ isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml Thu Nov 29
16:02:37 2012
@@ -180,7 +180,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.2.8</version>
+ <version>2.2.9</version>
</dependency>
</dependencies>
Modified: isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml (original)
+++ isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml Thu Nov 29
16:02:37 2012
@@ -143,7 +143,7 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.9.1</version>
+ <version>2.10.0</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@@ -153,7 +153,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.7</version>
+ <version>1.9</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml (original)
+++ isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml Thu Nov 29
16:02:37 2012
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.9.0-rc1</version>
+ <version>1.9.5</version>
<scope>test</scope>
</dependency>
Modified:
isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
(original)
+++
isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
Thu Nov 29 16:02:37 2012
@@ -36,7 +36,7 @@
<relativeUrl>runtimes/dflt/objecstores/sql/sql-tests-common/</relativeUrl>
<xml-objectstore.version>0.3.1-SNAPSHOT</xml-objectstore.version>
- <hsqldb.version>1.8.0.10</hsqldb.version>
+ <hsqldb.version>2.2.9</hsqldb.version>
</properties>
<!-- used in Site generation for relative references. -->
Modified:
isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/pom.xml
(original)
+++
isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/pom.xml
Thu Nov 29 16:02:37 2012
@@ -35,8 +35,8 @@
<siteBaseDir>../../../../..</siteBaseDir>
<relativeUrl>runtimes/dflt/objecstores/sql/sql-tests-served/</relativeUrl>
- <postgresql.version>8.4-701.jdbc4</postgresql.version>
- <mysql.version>5.0.5</mysql.version>
+ <postgresql.version>9.1-902.jdbc4</postgresql.version>
+ <mysql.version>5.1.22</mysql.version>
</properties>
<!-- used in Site generation for relative references. -->
Modified: isis/trunk/framework/runtimes/dflt/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/runtimes/dflt/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/runtimes/dflt/pom.xml (original)
+++ isis/trunk/framework/runtimes/dflt/pom.xml Thu Nov 29 16:02:37 2012
@@ -272,7 +272,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
+ <version>2.2.9</version>
<scope>test</scope>
</dependency>
Modified:
isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/MultiUserExplorationSessionTest.java
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/MultiUserExplorationSessionTest.java?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/MultiUserExplorationSessionTest.java
(original)
+++
isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/authentication/standard/MultiUserExplorationSessionTest.java
Thu Nov 29 16:02:37 2012
@@ -19,6 +19,7 @@
package org.apache.isis.runtimes.dflt.runtime.authentication.standard;
+import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -120,7 +121,7 @@ public class MultiUserExplorationSession
authenticator = new ExplorationAuthenticator(mockConfiguration);
final AuthenticationSession authSession =
authenticator.authenticate(new AuthenticationRequestExploration(), "");
- assertThat(authSession, is(MultiUserExplorationSession.class));
+ assertThat(authSession,
is(instanceOf(MultiUserExplorationSession.class)));
assertThat(authSession.getUserName(), is(equalTo("fred")));
}
@@ -135,7 +136,7 @@ public class MultiUserExplorationSession
});
authenticator = new ExplorationAuthenticator(mockConfiguration);
final AuthenticationSession authSession =
authenticator.authenticate(new AuthenticationRequestExploration(), "");
- assertThat(authSession, is(SimpleSession.class));
+ assertThat(authSession, is(instanceOf(SimpleSession.class)));
assertThat(authSession.getUserName(), is(equalTo("sven")));
}
@@ -151,7 +152,7 @@ public class MultiUserExplorationSession
authenticator = new ExplorationAuthenticator(mockConfiguration);
final AuthenticationSession authSession =
authenticator.authenticate(new AuthenticationRequestExploration(), "");
- assertThat(authSession, is(ExplorationSession.class));
+ assertThat(authSession, is(instanceOf(ExplorationSession.class)));
}
@Test
Modified: isis/trunk/framework/viewer/bdd/common/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/bdd/common/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/viewer/bdd/common/pom.xml (original)
+++ isis/trunk/framework/viewer/bdd/common/pom.xml Thu Nov 29 16:02:37 2012
@@ -37,19 +37,6 @@
<!-- used in Site generation for relative references. -->
<url>http://incubator.apache.org/isis/${relativeUrl}</url>
- <dependencyManagement>
- <dependencies>
- <!-- TODO: remove this dependency -->
- <dependency>
- <groupId>org.apache.isis.runtimes</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
Modified: isis/trunk/framework/viewer/bdd/concordion/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/bdd/concordion/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/viewer/bdd/concordion/pom.xml (original)
+++ isis/trunk/framework/viewer/bdd/concordion/pom.xml Thu Nov 29 16:02:37 2012
@@ -33,7 +33,7 @@
<siteBaseDir>../../..</siteBaseDir>
<relativeUrl>viewer/bdd/concordion/</relativeUrl>
- <concordion.version>1.4.1</concordion.version>
+ <concordion.version>1.4.2</concordion.version>
</properties>
<!-- used in Site generation for relative references. -->
Modified: isis/trunk/framework/viewer/bdd/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/bdd/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/viewer/bdd/pom.xml (original)
+++ isis/trunk/framework/viewer/bdd/pom.xml Thu Nov 29 16:02:37 2012
@@ -57,6 +57,9 @@
<dependencyManagement>
<dependencies>
+
+ <!-- for some reason, it seems to be necessary to specify the
+ versions, ie not being inherited from parent. Dunno why. -->
<!-- BDD Viewer -->
<dependency>
@@ -89,7 +92,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
</dependency>
<dependency>
@@ -101,26 +104,32 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>11.0</version>
+ <version>13.0.1</version>
</dependency>
- </dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+ <artifactId>dflt</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
+ <artifactId>dflt</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>progmodels</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
<modules>
Modified: isis/trunk/framework/viewer/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/viewer/pom.xml (original)
+++ isis/trunk/framework/viewer/pom.xml Thu Nov 29 16:02:37 2012
@@ -83,7 +83,7 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <!-- TODO: remove this dependency -->
+
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>security</artifactId>
@@ -91,7 +91,7 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <!-- TODO: remove this dependency -->
+
<dependency>
<groupId>org.apache.isis</groupId>
<artifactId>progmodels</artifactId>
Modified: isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml
(original)
+++ isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml Thu
Nov 29 16:02:37 2012
@@ -132,7 +132,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
Modified:
isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_xrofollowlinks.java
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_xrofollowlinks.java?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_xrofollowlinks.java
(original)
+++
isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_xrofollowlinks.java
Thu Nov 29 16:02:37 2012
@@ -73,7 +73,7 @@ public class DomainServiceResourceTest_s
restfulResponse = request.executeT();
repr = restfulResponse.getEntity();
- assertThat(repr.getValues().arrayGet(0),
isLink().value(is(not(Matchers.<JsonRepresentation> nullValue()))));
+ assertThat(repr.getValues().arrayGet(0),
isLink().value(is(not(Matchers.nullValue(JsonRepresentation.class)))));
assertThat(repr.getValues().arrayGet(0).getRepresentation("value"),
isMap());
}
Modified:
isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
---
isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
(original)
+++
isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
Thu Nov 29 16:02:37 2012
@@ -452,8 +452,6 @@ public class Dispatcher {
}
}
- } catch (final MalformedURLException e) {
- throw new IsisException(e);
} catch (final DocumentException e) {
throw new IsisException(e);
}
Modified: isis/trunk/framework/viewer/wicket/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/pom.xml (original)
+++ isis/trunk/framework/viewer/wicket/pom.xml Thu Nov 29 16:02:37 2012
@@ -36,11 +36,11 @@
<properties>
<siteBaseDir>../..</siteBaseDir>
- <relativeUrl>viewer/wicket/</relativeUrl>
+ <relativeUrl>viewer/wicket/</relativeUrl>
- <wicket.version>6.1.0</wicket.version>
- <wicketstuff.version>6.0.0</wicketstuff.version>
- <wicket-select2.version>2.0</wicket-select2.version>
+ <wicket.version>6.3.0</wicket.version>
+ <wicketstuff.version>6.0.0</wicketstuff.version>
+ <wicket-select2.version>2.0</wicket-select2.version>
<docbkxGuideTitle>Apache Isis Wicket Viewer</docbkxGuideTitle>
<docbkxGuideSubTitle>Customization, Configuration and Deployment
Guide</docbkxGuideSubTitle>
@@ -204,7 +204,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<!-- NOT SURE WHY THIS ISN'T INHERITED -->
- <version>1.6.4</version>
+ <version>1.7.2</version>
</dependency>
<dependency>
Modified: isis/trunk/framework/viewer/wicket/wicket-viewer/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-viewer/pom.xml?rev=1415225&r1=1415224&r2=1415225&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-viewer/pom.xml (original)
+++ isis/trunk/framework/viewer/wicket/wicket-viewer/pom.xml Thu Nov 29
16:02:37 2012
@@ -125,7 +125,7 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice-parent</artifactId>
- <version>2.0</version>
+ <version>3.0</version>
<type>pom</type>
</dependency>
