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 2016/02/10 22:47:51 UTC
[01/10] isis git commit: Revert "ISIS-1288: updating minor
dependencies"
Repository: isis
Updated Branches:
refs/heads/master e02d72186 -> f206da68f
Revert "ISIS-1288: updating minor dependencies"
This reverts commit 8e88cc40f88d4aa5ccb4a1a99fa2168521b5c75a.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/12f9dfa9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/12f9dfa9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/12f9dfa9
Branch: refs/heads/master
Commit: 12f9dfa9d83d7a866b00b6f2ab6e8798865297b3
Parents: e02d721
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:02:22 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:11:25 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/isis/applib/value/Blob.java | 10 ++-
.../java/org/apache/isis/applib/value/Clob.java | 10 ++-
core/maven-plugin/pom.xml | 54 +++++++-----
core/metamodel/pom.xml | 7 ++
.../isis/core/commons/lang/ClassExtensions.java | 7 +-
core/pom.xml | 86 ++++++--------------
core/runtime/pom.xml | 26 +++---
.../specsupport/specs/CukeSpecsAbstract.java | 7 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +
.../server/resources/VersionReprRenderer.java | 2 +-
core/wrapper/pom.xml | 15 ++++
12 files changed, 118 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java b/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
index 7403c4d..73700f8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
@@ -26,7 +26,8 @@ import java.io.Serializable;
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
-import com.google.common.io.ByteSource;
+import com.google.common.io.ByteStreams;
+import com.google.common.io.OutputSupplier;
public final class Blob implements NamedWithMimeType, Serializable {
@@ -90,7 +91,12 @@ public final class Blob implements NamedWithMimeType, Serializable {
}
public void writeBytesTo(final OutputStream os) throws IOException {
- ByteSource.wrap(bytes).copyTo(os);
+ ByteStreams.write(bytes, new OutputSupplier<OutputStream>() {
+ @Override
+ public OutputStream getOutput() throws IOException {
+ return os;
+ }
+ });
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java b/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
index 41b7b7e..275ee93 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
@@ -26,7 +26,8 @@ import java.io.Writer;
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
-import com.google.common.io.CharSource;
+import com.google.common.io.CharStreams;
+import com.google.common.io.OutputSupplier;
public final class Clob implements NamedWithMimeType, Serializable {
@@ -92,7 +93,12 @@ public final class Clob implements NamedWithMimeType, Serializable {
}
public void writeCharsTo(final Writer wr) throws IOException {
- CharSource.wrap(chars).copyTo(wr);
+ CharStreams.write(chars, new OutputSupplier<Writer>() {
+ @Override
+ public Writer getOutput() throws IOException {
+ return wr;
+ }
+ });
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index f1850b3..4456432 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -40,14 +40,6 @@
<maven>3.0.4</maven>
</prerequisites>
- <properties>
- <maven-core.version>3.0.5</maven-core.version>
- <maven-project.version>3.0-alpha-2</maven-project.version>
- <maven-plugin-annotations.version>3.2</maven-plugin-annotations.version>
- <plexus-sec-dispatcher.version>1.3</plexus-sec-dispatcher.version>
- <plexus-utils.version>2.1</plexus-utils.version>
- </properties>
-
<build>
<pluginManagement>
@@ -98,6 +90,28 @@
</execution>
</executions>
</plugin>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>1.5</version>
+ </jdk>
+ </toolchains>
+ </configuration>
+ </plugin>
+ -->
</plugins>
</build>
@@ -122,19 +136,19 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>${maven-core.version}</version>
+ <version>3.0.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>${plexus-utils.version}</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>${maven-plugin-annotations.version}</version>
+ <version>3.2</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
@@ -146,7 +160,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>${maven-core.version}</version>
+ <version>3.0.5</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -158,7 +172,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>${maven-core.version}</version>
+ <version>3.0.5</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -170,7 +184,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>
- <version>${maven-core.version}</version>
+ <version>3.0.5</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -182,7 +196,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>${maven-core.version}</version>
+ <version>3.0.5</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -194,7 +208,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>${maven-core.version}</version>
+ <version>3.0.5</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -206,7 +220,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>${maven-project.version}</version>
+ <version>3.0-alpha-2</version>
<exclusions>
<!-- for dependency convergence -->
<exclusion>
@@ -239,7 +253,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
- <version>${maven-core.version}</version>
+ <version>3.0.5</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -271,7 +285,7 @@
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
- <version>${plexus-sec-dispatcher.version}</version>
+ <version>1.3</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -283,7 +297,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
- <version>${maven-project.version}</version>
+ <version>3.0-alpha-2</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 16621b2..493c298 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -96,6 +96,13 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
+ <version>1.5.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
index 5f6983d..3f4a3b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.commons.lang;
import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -28,7 +29,7 @@ import java.net.URL;
import java.nio.charset.Charset;
import java.util.Properties;
-import com.google.common.io.ByteSource;
+import com.google.common.io.InputSupplier;
import com.google.common.io.Resources;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -155,9 +156,9 @@ public final class ClassExtensions {
public static Properties resourceProperties(final Class<?> extendee, final String suffix) {
try {
final URL url = Resources.getResource(extendee, extendee.getSimpleName()+suffix);
- final ByteSource byteSource = Resources.asByteSource(url);
+ final InputSupplier<InputStream> inputSupplier = com.google.common.io.Resources.newInputStreamSupplier(url);
final Properties properties = new Properties();
- properties.load(byteSource.openStream());
+ properties.load(inputSupplier.getInput());
return properties;
} catch (Exception e) {
return null;
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d5873ab..14f9b5c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -85,56 +85,47 @@
<!-- Datanucleus Objectstore -->
<jdo-api.version>3.1</jdo-api.version>
+ <datanucleus-core.version>4.1.2</datanucleus-core.version>
+ <datanucleus-api-jdo.version>4.1.0-release</datanucleus-api-jdo.version>
+ <datanucleus-jdo-query.version>4.0.4</datanucleus-jdo-query.version>
+ <datanucleus-rdbms.version>4.1.2</datanucleus-rdbms.version>
- <datanucleus-core.version>4.1.7</datanucleus-core.version>
- <datanucleus-api-jdo.version>4.1.1</datanucleus-api-jdo.version>
- <datanucleus-jdo-query.version>4.0.5</datanucleus-jdo-query.version>
- <datanucleus-rdbms.version>4.1.9</datanucleus-rdbms.version>
-
- <datanucleus-jodatime.version>4.1.1</datanucleus-jodatime.version>
- <datanucleus-maven-plugin.version>4.0.2</datanucleus-maven-plugin.version>
+ <datanucleus-jodatime.version>4.1.0-release</datanucleus-jodatime.version>
+ <datanucleus-maven-plugin.version>4.0.1</datanucleus-maven-plugin.version>
<shiro.version>1.2.3</shiro.version>
- <slf4j.version>1.7.13</slf4j.version>
+ <slf4j.version>1.7.10</slf4j.version>
<log4j.version>1.2.17</log4j.version>
- <joda-time.version>2.9.1</joda-time.version>
- <guava.version>19.0.20150826</guava.version>
+ <joda-time.version>2.3</joda-time.version>
+ <guava.version>16.0.1</guava.version>
<hamcrest.version>1.3</hamcrest.version>
- <objenesis.version>2.2</objenesis.version>
- <javassist.version>3.20.0-GA</javassist.version>
- <reflections.version>0.9.10</reflections.version>
+ <objenesis.version>1.4</objenesis.version>
+ <javassist.version>3.19.0-GA</javassist.version>
+ <reflections.version>0.9.9</reflections.version>
- <commons-logging.version>1.2</commons-logging.version>
- <commons-cli.version>1.3.1</commons-cli.version>
+ <commons-logging.version>1.1.2</commons-logging.version>
+ <commons-cli.version>1.2</commons-cli.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
- <commons-codec.version>1.10</commons-codec.version>
- <commons-email.version>1.4</commons-email.version>
- <com-sun-mail.version>1.5.2</com-sun-mail.version>
-
- <axon-core.version>2.4</axon-core.version>
+ <commons-codec.version>1.9</commons-codec.version>
- <jackson.version>2.6.4</jackson.version>
- <gson.version>2.5</gson.version>
- <swagger-core.version>1.5.5</swagger-core.version>
- <swagger-ui.version>2.1.3</swagger-ui.version>
- <webjars-servlet-2.x.version>1.4</webjars-servlet-2.x.version>
+ <jackson.version>2.5.0</jackson.version>
+ <gson.version>2.3.1</gson.version>
<!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
- <!-- using 2.3.3 throws SQL exception in simpleapp integtests -->
<hsqldb.version>2.3.1</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
- <resteasy-jaxrs.version>3.0.14.Final</resteasy-jaxrs.version>
+ <resteasy-jaxrs.version>3.0.11.Final</resteasy-jaxrs.version>
<jetty.version>9.3.6.v20151106</jetty.version>
<wicket.version>6.20.0</wicket.version>
<wicketstuff.version>6.20.0</wicketstuff.version>
- <wicket-webjars.version>0.4.8</wicket-webjars.version>
+ <wicket-webjars.version>0.4.7</wicket-webjars.version>
<wicket-bootstrap.version>0.9.15</wicket-bootstrap.version>
<wicket-source.version>6.0.0.8</wicket-source.version>
@@ -142,19 +133,18 @@
<select2.version>3.5.2</select2.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
- <guice.version>4.0</guice.version>
- <picocontainer.version>2.15</picocontainer.version>
+ <guice.version>3.0</guice.version>
+ <picocontainer.version>2.14.3</picocontainer.version>
<dom4j.version>1.6.1</dom4j.version>
<jdom.version>2.0.2</jdom.version>
- <xstream.version>1.4.8</xstream.version>
+ <xstream.version>1.4.7</xstream.version>
<htmlparser.version>2.1</htmlparser.version>
<junit.version>4.12</junit.version>
- <!-- 2.8.1 depends on cglib-nodep 3.1 whereas axonframework depends on 2.2.2 -->
<jmock.version>2.6.0</jmock.version>
<easymock.version>2.5.2</easymock.version>
- <cucumber.version>1.2.4</cucumber.version>
+ <cucumber.version>1.1.5</cucumber.version>
<geronimo-jsp_2.1_spec.version>1.0.1</geronimo-jsp_2.1_spec.version>
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
@@ -165,11 +155,7 @@
<geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
<geronimo-atinject_1.0_spec.version>1.0</geronimo-atinject_1.0_spec.version>
<geronimo-jcdi_1.0_spec.version>1.0</geronimo-jcdi_1.0_spec.version>
-
<validation-api.version>1.1.0.Final</validation-api.version>
-
- <javax-mail.version>1.4.7</javax-mail.version>
-
</properties>
<scm>
@@ -1869,7 +1855,6 @@ ${license.additional-notes}
</dependency>
-
<!-- javax APIs -->
<dependency>
<groupId>javax.validation</groupId>
@@ -1909,30 +1894,7 @@ ${license.additional-notes}
<artifactId>datanucleus-jodatime</artifactId>
<version>${datanucleus-jodatime.version}</version>
</dependency>
-
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-core</artifactId>
- <version>${swagger-core.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>swagger-ui</artifactId>
- <version>${swagger-ui.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>webjars-servlet-2.x</artifactId>
- <version>${webjars-servlet-2.x.version}</version>
- </dependency>
-
+
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 33f26cd..cacb227 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -18,9 +18,9 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
+ <parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>1.12.0-SNAPSHOT</version>
@@ -143,26 +143,24 @@
<profile>
<id>email-notification-service</id>
<activation>
- <property>
- <name>!skip.email-notification-service</name>
- </property>
+ <activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
- <version>${commons-email.version}</version>
+ <version>1.3.3</version>
<exclusions>
<exclusion>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>${com-sun-mail.version}</version>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.7</version>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
@@ -180,15 +178,13 @@
<profile>
<id>axon-event-bus</id>
<activation>
- <property>
- <name>!skip.axon-event-bus</name>
- </property>
+ <activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-core</artifactId>
- <version>${axon-core.version}</version>
+ <version>2.4</version>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
----------------------------------------------------------------------
diff --git a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
index 07f72e3..7d6295d 100644
--- a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
+++ b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
@@ -16,16 +16,15 @@
*/
package org.apache.isis.core.specsupport.specs;
-import org.junit.runner.RunWith;
-
-import cucumber.api.CucumberOptions;
import cucumber.api.junit.Cucumber;
+import org.junit.runner.RunWith;
+
/**
* Base class for all Cucumber specs run at unit-scope; runs the spec as a JUnit test.
*/
@RunWith(Cucumber.class)
-@CucumberOptions(
+@Cucumber.Options(
format = {
"html:target/cucumber-html-report"
// addHook causes an exception to be thrown if this reporter is registered...
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index f8806d7..c9dffa6 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
+ <version>3.0.1</version>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 498c634..a2bc140 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -64,11 +64,13 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
+ <version>2.1.3</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-servlet-2.x</artifactId>
+ <version>1.1</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
index 7668d95..0d1de1d 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
@@ -90,7 +90,7 @@ public class VersionReprRenderer extends ReprRendererAbstract<VersionReprRendere
try {
URL resource = Resources.getResource(META_INF_POM_PROPERTIES);
Properties p = new Properties();
- p.load(Resources.asCharSource(resource, Charset.defaultCharset()).openStream());
+ p.load(Resources.newReaderSupplier(resource, Charset.defaultCharset()).getInput());
return p.getProperty("version");
} catch (final Exception ex) {
return "UNKNOWN";
http://git-wip-us.apache.org/repos/asf/isis/blob/12f9dfa9/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index eefd398..e4486a5 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -31,6 +31,21 @@
<name>Isis Wrapper Service</name>
<description>Isis Wrapper Service</description>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
[02/10] isis git commit: ISIS-1288: file changes for upgrade to Guava
Posted by da...@apache.org.
ISIS-1288: file changes for upgrade to Guava
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cf8c2d1e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cf8c2d1e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cf8c2d1e
Branch: refs/heads/master
Commit: cf8c2d1e8dccf3882cfa41e0182f2f6827a1fb89
Parents: 12f9dfa
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:15:35 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:15:35 2016 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/isis/applib/value/Blob.java | 10 ++--------
.../src/main/java/org/apache/isis/applib/value/Clob.java | 10 ++--------
.../apache/isis/core/commons/lang/ClassExtensions.java | 7 +++----
.../server/resources/VersionReprRenderer.java | 2 +-
4 files changed, 8 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/cf8c2d1e/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java b/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
index 73700f8..7403c4d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/value/Blob.java
@@ -26,8 +26,7 @@ import java.io.Serializable;
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.OutputSupplier;
+import com.google.common.io.ByteSource;
public final class Blob implements NamedWithMimeType, Serializable {
@@ -91,12 +90,7 @@ public final class Blob implements NamedWithMimeType, Serializable {
}
public void writeBytesTo(final OutputStream os) throws IOException {
- ByteStreams.write(bytes, new OutputSupplier<OutputStream>() {
- @Override
- public OutputStream getOutput() throws IOException {
- return os;
- }
- });
+ ByteSource.wrap(bytes).copyTo(os);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/cf8c2d1e/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java b/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
index 275ee93..41b7b7e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/value/Clob.java
@@ -26,8 +26,7 @@ import java.io.Writer;
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
-import com.google.common.io.CharStreams;
-import com.google.common.io.OutputSupplier;
+import com.google.common.io.CharSource;
public final class Clob implements NamedWithMimeType, Serializable {
@@ -93,12 +92,7 @@ public final class Clob implements NamedWithMimeType, Serializable {
}
public void writeCharsTo(final Writer wr) throws IOException {
- CharStreams.write(chars, new OutputSupplier<Writer>() {
- @Override
- public Writer getOutput() throws IOException {
- return wr;
- }
- });
+ CharSource.wrap(chars).copyTo(wr);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/cf8c2d1e/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
index 3f4a3b9..5f6983d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassExtensions.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.commons.lang;
import java.io.IOException;
-import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -29,7 +28,7 @@ import java.net.URL;
import java.nio.charset.Charset;
import java.util.Properties;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteSource;
import com.google.common.io.Resources;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -156,9 +155,9 @@ public final class ClassExtensions {
public static Properties resourceProperties(final Class<?> extendee, final String suffix) {
try {
final URL url = Resources.getResource(extendee, extendee.getSimpleName()+suffix);
- final InputSupplier<InputStream> inputSupplier = com.google.common.io.Resources.newInputStreamSupplier(url);
+ final ByteSource byteSource = Resources.asByteSource(url);
final Properties properties = new Properties();
- properties.load(inputSupplier.getInput());
+ properties.load(byteSource.openStream());
return properties;
} catch (Exception e) {
return null;
http://git-wip-us.apache.org/repos/asf/isis/blob/cf8c2d1e/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
index 0d1de1d..7668d95 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
@@ -90,7 +90,7 @@ public class VersionReprRenderer extends ReprRendererAbstract<VersionReprRendere
try {
URL resource = Resources.getResource(META_INF_POM_PROPERTIES);
Properties p = new Properties();
- p.load(Resources.newReaderSupplier(resource, Charset.defaultCharset()).getInput());
+ p.load(Resources.asCharSource(resource, Charset.defaultCharset()).openStream());
return p.getProperty("version");
} catch (final Exception ex) {
return "UNKNOWN";
[10/10] isis git commit: ISIS-1288: adding in upgrade to DN
maven-plugin;
confirmed issue appears to be with datanucleus-jodatime 4.1.0-release to 4.1.1
Posted by da...@apache.org.
ISIS-1288: adding in upgrade to DN maven-plugin; confirmed issue appears to be with datanucleus-jodatime 4.1.0-release to 4.1.1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f206da68
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f206da68
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f206da68
Branch: refs/heads/master
Commit: f206da68fa56f4a841a0d31ff8652d26d5eed3af
Parents: 817fcca
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 19:42:00 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 19:42:00 2016 +0000
----------------------------------------------------------------------
core/pom.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f206da68/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b9e5349..3734a80 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -92,11 +92,13 @@
<datanucleus-rdbms.version>4.1.9</datanucleus-rdbms.version>
<datanucleus-jodatime.version>4.1.0-release</datanucleus-jodatime.version>
- <datanucleus-maven-plugin.version>4.0.1</datanucleus-maven-plugin.version>
<!--
+ ISIS-1288: seen integration tests to fail;
+ domain object date holding 1-Aug-2015 after xactn retrieved as 31-Jul-2015
+
<datanucleus-jodatime.version>4.1.1</datanucleus-jodatime.version>
- <datanucleus-maven-plugin.version>4.0.2</datanucleus-maven-plugin.version>
-->
+ <datanucleus-maven-plugin.version>4.0.2</datanucleus-maven-plugin.version>
<shiro.version>1.2.3</shiro.version>
[03/10] isis git commit: ISIS-1288: pom.xml change for guava
Posted by da...@apache.org.
ISIS-1288: pom.xml change for guava
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8d7c8788
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8d7c8788
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8d7c8788
Branch: refs/heads/master
Commit: 8d7c87885aeee8f2245f616e37abb5a7053746b9
Parents: cf8c2d1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:16:38 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:16:38 2016 +0000
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8d7c8788/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 14f9b5c..57d5fe7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -99,7 +99,7 @@
<log4j.version>1.2.17</log4j.version>
<joda-time.version>2.3</joda-time.version>
- <guava.version>16.0.1</guava.version>
+ <guava.version>19.0.20150826</guava.version>
<hamcrest.version>1.3</hamcrest.version>
[07/10] isis git commit: ISIS-1288: everything bar the jdo and
jodatime stuff
Posted by da...@apache.org.
ISIS-1288: everything bar the jdo and jodatime stuff
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8787d541
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8787d541
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8787d541
Branch: refs/heads/master
Commit: 8787d5419d8738a0397f4b001b3c3fce57d0e261
Parents: 58b8bc4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:36:56 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:37:18 2016 +0000
----------------------------------------------------------------------
core/metamodel/pom.xml | 7 ---
core/pom.xml | 65 ++++++++++++++++++++------
core/runtime/pom.xml | 26 ++++++-----
core/viewer-restfulobjects-server/pom.xml | 2 -
core/wrapper/pom.xml | 15 ------
5 files changed, 66 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8787d541/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 493c298..16621b2 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -96,13 +96,6 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
- <version>1.5.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/8787d541/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c666452..b24cc1b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -103,29 +103,37 @@
<hamcrest.version>1.3</hamcrest.version>
- <objenesis.version>1.4</objenesis.version>
- <javassist.version>3.19.0-GA</javassist.version>
- <reflections.version>0.9.9</reflections.version>
+ <objenesis.version>2.2</objenesis.version>
+ <javassist.version>3.20.0-GA</javassist.version>
+ <reflections.version>0.9.10</reflections.version>
- <commons-logging.version>1.1.2</commons-logging.version>
- <commons-cli.version>1.2</commons-cli.version>
+ <commons-logging.version>1.2</commons-logging.version>
+ <commons-cli.version>1.3.1</commons-cli.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
- <commons-codec.version>1.9</commons-codec.version>
+ <commons-codec.version>1.10</commons-codec.version>
+ <commons-email.version>1.4</commons-email.version>
+ <com-sun-mail.version>1.5.2</com-sun-mail.version>
- <jackson.version>2.5.0</jackson.version>
- <gson.version>2.3.1</gson.version>
+ <axon-core.version>2.4</axon-core.version>
+
+ <jackson.version>2.6.4</jackson.version>
+ <gson.version>2.5</gson.version>
+ <swagger-core.version>1.5.5</swagger-core.version>
+ <swagger-ui.version>2.1.3</swagger-ui.version>
+ <webjars-servlet-2.x.version>1.4</webjars-servlet-2.x.version>
<!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
+ <!-- using 2.3.3 throws SQL exception in simpleapp integtests -->
<hsqldb.version>2.3.1</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
- <resteasy-jaxrs.version>3.0.11.Final</resteasy-jaxrs.version>
+ <resteasy-jaxrs.version>3.0.14.Final</resteasy-jaxrs.version>
<jetty.version>9.3.6.v20151106</jetty.version>
<wicket.version>6.20.0</wicket.version>
<wicketstuff.version>6.20.0</wicketstuff.version>
- <wicket-webjars.version>0.4.7</wicket-webjars.version>
+ <wicket-webjars.version>0.4.8</wicket-webjars.version>
<wicket-bootstrap.version>0.9.15</wicket-bootstrap.version>
<wicket-source.version>6.0.0.8</wicket-source.version>
@@ -133,15 +141,16 @@
<select2.version>3.5.2</select2.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
- <guice.version>3.0</guice.version>
- <picocontainer.version>2.14.3</picocontainer.version>
+ <guice.version>4.0</guice.version>
+ <picocontainer.version>2.15</picocontainer.version>
<dom4j.version>1.6.1</dom4j.version>
<jdom.version>2.0.2</jdom.version>
- <xstream.version>1.4.7</xstream.version>
+ <xstream.version>1.4.8</xstream.version>
<htmlparser.version>2.1</htmlparser.version>
<junit.version>4.12</junit.version>
+ <!-- 2.8.1 depends on cglib-nodep 3.1 whereas axonframework depends on 2.2.2 -->
<jmock.version>2.6.0</jmock.version>
<easymock.version>2.5.2</easymock.version>
<cucumber.version>1.2.4</cucumber.version>
@@ -155,7 +164,11 @@
<geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
<geronimo-atinject_1.0_spec.version>1.0</geronimo-atinject_1.0_spec.version>
<geronimo-jcdi_1.0_spec.version>1.0</geronimo-jcdi_1.0_spec.version>
+
<validation-api.version>1.1.0.Final</validation-api.version>
+
+ <javax-mail.version>1.4.7</javax-mail.version>
+
</properties>
<scm>
@@ -1855,6 +1868,7 @@ ${license.additional-notes}
</dependency>
+
<!-- javax APIs -->
<dependency>
<groupId>javax.validation</groupId>
@@ -1894,7 +1908,30 @@ ${license.additional-notes}
<artifactId>datanucleus-jodatime</artifactId>
<version>${datanucleus-jodatime.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-core</artifactId>
+ <version>${swagger-core.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>swagger-ui</artifactId>
+ <version>${swagger-ui.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>webjars-servlet-2.x</artifactId>
+ <version>${webjars-servlet-2.x.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/8787d541/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index cacb227..33f26cd 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -18,9 +18,9 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
+ <parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>1.12.0-SNAPSHOT</version>
@@ -143,24 +143,26 @@
<profile>
<id>email-notification-service</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!skip.email-notification-service</name>
+ </property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
- <version>1.3.3</version>
+ <version>${commons-email.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.7</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>${com-sun-mail.version}</version>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
@@ -178,13 +180,15 @@
<profile>
<id>axon-event-bus</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!skip.axon-event-bus</name>
+ </property>
</activation>
<dependencies>
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-core</artifactId>
- <version>2.4</version>
+ <version>${axon-core.version}</version>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/isis/blob/8787d541/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index a2bc140..498c634 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -64,13 +64,11 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
- <version>2.1.3</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-servlet-2.x</artifactId>
- <version>1.1</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/8787d541/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index e4486a5..eefd398 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -31,21 +31,6 @@
<name>Isis Wrapper Service</name>
<description>Isis Wrapper Service</description>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.3.1</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.2.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
[05/10] isis git commit: ISIS-1288: updates to mvn plugin dependencies
Posted by da...@apache.org.
ISIS-1288: updates to mvn plugin dependencies
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b95bbf7c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b95bbf7c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b95bbf7c
Branch: refs/heads/master
Commit: b95bbf7cb2c99123b40166a879607bc80bbce287
Parents: 05f1315
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:26:06 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:26:06 2016 +0000
----------------------------------------------------------------------
core/maven-plugin/pom.xml | 54 ++++++++++++++++--------------------------
1 file changed, 20 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b95bbf7c/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 4456432..f1850b3 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -40,6 +40,14 @@
<maven>3.0.4</maven>
</prerequisites>
+ <properties>
+ <maven-core.version>3.0.5</maven-core.version>
+ <maven-project.version>3.0-alpha-2</maven-project.version>
+ <maven-plugin-annotations.version>3.2</maven-plugin-annotations.version>
+ <plexus-sec-dispatcher.version>1.3</plexus-sec-dispatcher.version>
+ <plexus-utils.version>2.1</plexus-utils.version>
+ </properties>
+
<build>
<pluginManagement>
@@ -90,28 +98,6 @@
</execution>
</executions>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>1.5</version>
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
- -->
</plugins>
</build>
@@ -136,19 +122,19 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>2.1</version>
+ <version>${plexus-utils.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.2</version>
+ <version>${maven-plugin-annotations.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
@@ -160,7 +146,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -172,7 +158,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -184,7 +170,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -196,7 +182,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -208,7 +194,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -220,7 +206,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>3.0-alpha-2</version>
+ <version>${maven-project.version}</version>
<exclusions>
<!-- for dependency convergence -->
<exclusion>
@@ -253,7 +239,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
- <version>3.0.5</version>
+ <version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -285,7 +271,7 @@
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
- <version>1.3</version>
+ <version>${plexus-sec-dispatcher.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -297,7 +283,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
- <version>3.0-alpha-2</version>
+ <version>${maven-project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
[04/10] isis git commit: ISIS-1288: update to Cucumber
Posted by da...@apache.org.
ISIS-1288: update to Cucumber
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/05f13152
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/05f13152
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/05f13152
Branch: refs/heads/master
Commit: 05f13152076ce75885747e75f941851f458c66ae
Parents: 8d7c878
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:23:44 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:24:59 2016 +0000
----------------------------------------------------------------------
core/pom.xml | 2 +-
.../apache/isis/core/specsupport/specs/CukeSpecsAbstract.java | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/05f13152/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 57d5fe7..9365da8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -144,7 +144,7 @@
<junit.version>4.12</junit.version>
<jmock.version>2.6.0</jmock.version>
<easymock.version>2.5.2</easymock.version>
- <cucumber.version>1.1.5</cucumber.version>
+ <cucumber.version>1.2.4</cucumber.version>
<geronimo-jsp_2.1_spec.version>1.0.1</geronimo-jsp_2.1_spec.version>
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/05f13152/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
----------------------------------------------------------------------
diff --git a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
index 7d6295d..07f72e3 100644
--- a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
+++ b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
@@ -16,15 +16,16 @@
*/
package org.apache.isis.core.specsupport.specs;
-import cucumber.api.junit.Cucumber;
-
import org.junit.runner.RunWith;
+import cucumber.api.CucumberOptions;
+import cucumber.api.junit.Cucumber;
+
/**
* Base class for all Cucumber specs run at unit-scope; runs the spec as a JUnit test.
*/
@RunWith(Cucumber.class)
-@Cucumber.Options(
+@CucumberOptions(
format = {
"html:target/cucumber-html-report"
// addHook causes an exception to be thrown if this reporter is registered...
[08/10] isis git commit: ISIS-1288: bumping joda
Posted by da...@apache.org.
ISIS-1288: bumping joda
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f3200236
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f3200236
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f3200236
Branch: refs/heads/master
Commit: f32002366ae9802a5dcbf584c21e08cd5420c061
Parents: 8787d54
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:43:05 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:43:05 2016 +0000
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f3200236/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b24cc1b..9a1f563 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -98,7 +98,7 @@
<slf4j.version>1.7.13</slf4j.version>
<log4j.version>1.2.17</log4j.version>
- <joda-time.version>2.3</joda-time.version>
+ <joda-time.version>2.9.1</joda-time.version>
<guava.version>19.0.20150826</guava.version>
<hamcrest.version>1.3</hamcrest.version>
[09/10] isis git commit: ISIS-1288: upgrading most of JDO
Posted by da...@apache.org.
ISIS-1288: upgrading most of JDO
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/817fcca5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/817fcca5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/817fcca5
Branch: refs/heads/master
Commit: 817fcca58f0da76f53f698d34364db80fa8dd6be
Parents: f320023
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:48:41 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:48:41 2016 +0000
----------------------------------------------------------------------
core/pom.xml | 13 +++++++++----
core/unittestsupport/pom.xml | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/817fcca5/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 9a1f563..b9e5349 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -85,13 +85,18 @@
<!-- Datanucleus Objectstore -->
<jdo-api.version>3.1</jdo-api.version>
- <datanucleus-core.version>4.1.2</datanucleus-core.version>
- <datanucleus-api-jdo.version>4.1.0-release</datanucleus-api-jdo.version>
- <datanucleus-jdo-query.version>4.0.4</datanucleus-jdo-query.version>
- <datanucleus-rdbms.version>4.1.2</datanucleus-rdbms.version>
+
+ <datanucleus-core.version>4.1.7</datanucleus-core.version>
+ <datanucleus-api-jdo.version>4.1.1</datanucleus-api-jdo.version>
+ <datanucleus-jdo-query.version>4.0.5</datanucleus-jdo-query.version>
+ <datanucleus-rdbms.version>4.1.9</datanucleus-rdbms.version>
<datanucleus-jodatime.version>4.1.0-release</datanucleus-jodatime.version>
<datanucleus-maven-plugin.version>4.0.1</datanucleus-maven-plugin.version>
+ <!--
+ <datanucleus-jodatime.version>4.1.1</datanucleus-jodatime.version>
+ <datanucleus-maven-plugin.version>4.0.2</datanucleus-maven-plugin.version>
+ -->
<shiro.version>1.2.3</shiro.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/817fcca5/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index c9dffa6..f8806d7 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
- <version>3.0.1</version>
+ <version>${jdo-api.version}</version>
<optional>true</optional>
</dependency>
[06/10] isis git commit: ISIS-1288: bumping slf4j
Posted by da...@apache.org.
ISIS-1288: bumping slf4j
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/58b8bc4f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/58b8bc4f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/58b8bc4f
Branch: refs/heads/master
Commit: 58b8bc4ffd0ac06e424ec2d89defa0cd695abf66
Parents: b95bbf7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:27:03 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:27:03 2016 +0000
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/58b8bc4f/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 9365da8..c666452 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -95,7 +95,7 @@
<shiro.version>1.2.3</shiro.version>
- <slf4j.version>1.7.10</slf4j.version>
+ <slf4j.version>1.7.13</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<joda-time.version>2.3</joda-time.version>