This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch dev/2.0.0-M2-cherrypicked in repository https://gitbox.apache.org/repos/asf/isis.git
commit 13ae816977f0d6a39aefacbaba102a93a4cb228e Author: Dan Haywood <d...@haywood-associates.co.uk> AuthorDate: Tue Jan 9 07:15:06 2018 +0000 ISIS-1811: updates versions to 2.0.0-M2-SNAPSHOT Conflicts: core/pom.xml --- adocs/documentation/pom.xml | 2 +- core/applib/pom.xml | 2 +- core/integtestsupport/pom.xml | 2 +- core/log4j/pom.xml | 2 +- core/maven-plugin/pom.xml | 2 +- core/mavendeps/intellij/pom.xml | 2 +- core/mavendeps/testing/pom.xml | 2 +- core/mavendeps/webapp/pom.xml | 2 +- core/metamodel/pom.xml | 2 +- core/pom.xml | 10 +++++----- core/runtime/pom.xml | 2 +- .../systemusinginstallers/IsisComponentProvider.java | 13 ------------- core/schema/pom.xml | 2 +- core/security-shiro/pom.xml | 6 +++--- core/security/pom.xml | 2 +- core/specsupport/pom.xml | 2 +- core/unittestsupport/pom.xml | 2 +- core/viewer-restfulobjects-applib/pom.xml | 2 +- core/viewer-restfulobjects-rendering/pom.xml | 2 +- core/viewer-restfulobjects-server/pom.xml | 2 +- core/viewer-wicket-applib/pom.xml | 2 +- core/viewer-wicket-impl/pom.xml | 2 +- core/viewer-wicket-model/pom.xml | 2 +- core/viewer-wicket-ui/pom.xml | 2 +- core/webserver/pom.xml | 2 +- core/wrapper/pom.xml | 2 +- example/application/helloworld/pom.xml | 2 +- example/application/simpleapp/application/pom.xml | 2 +- example/application/simpleapp/module-simple/pom.xml | 2 +- example/application/simpleapp/pom.xml | 2 +- example/application/simpleapp/webapp/pom.xml | 2 +- example/archetype/helloworld/pom.xml | 2 +- example/archetype/simpleapp/pom.xml | 4 ++-- pom.xml | 2 +- 34 files changed, 40 insertions(+), 53 deletions(-) diff --git a/adocs/documentation/pom.xml b/adocs/documentation/pom.xml index 960a2e4..659e31b 100644 --- a/adocs/documentation/pom.xml +++ b/adocs/documentation/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.isis.docs</groupId> <artifactId>isis-documentation</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Isis Docs</name> diff --git a/core/applib/pom.xml b/core/applib/pom.xml index 9cfea89..7fa9feb 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>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-applib</artifactId> diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml index 50e15c1..83e5dd5 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>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-integtestsupport</artifactId> diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml index 115312e..12b8253 100644 --- a/core/log4j/pom.xml +++ b/core/log4j/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-log4j</artifactId> diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml index 3e3646b..0ff59a6 100644 --- a/core/maven-plugin/pom.xml +++ b/core/maven-plugin/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <groupId>org.apache.isis.tool</groupId> diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml index 7a387b6..ce57609 100644 --- a/core/mavendeps/intellij/pom.xml +++ b/core/mavendeps/intellij/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml index 6504f20..cd2b9f2 100644 --- a/core/mavendeps/testing/pom.xml +++ b/core/mavendeps/testing/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml index ddeecf4..9b3d24e 100644 --- a/core/mavendeps/webapp/pom.xml +++ b/core/mavendeps/webapp/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml index 697eb3d..1361ac7 100644 --- a/core/metamodel/pom.xml +++ b/core/metamodel/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-metamodel</artifactId> diff --git a/core/pom.xml b/core/pom.xml index 2eaff2a..eadeac8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <packaging>pom</packaging> @@ -50,7 +50,7 @@ </prerequisites> <properties> - <core-version>2.0.0-M1-SNAPSHOT</core-version> + <core-version>2.0.0-M2-SNAPSHOT</core-version> <jar-plugin.automaticModuleName>org.apache.isis.core</jar-plugin.automaticModuleName> <git-plugin.propertiesDir>org/apache/isis/core</git-plugin.propertiesDir> @@ -90,10 +90,10 @@ <!-- Datanucleus Objectstore --> <jdo-api.version>3.2.0-m7</jdo-api.version> - <datanucleus-core.version>5.1.2</datanucleus-core.version> - <datanucleus-api-jdo.version>5.1.2</datanucleus-api-jdo.version> + <datanucleus-core.version>5.1.5</datanucleus-core.version> + <datanucleus-api-jdo.version>5.1.4</datanucleus-api-jdo.version> <datanucleus-jdo-query.version>5.0.2</datanucleus-jdo-query.version> - <datanucleus-rdbms.version>5.1.2</datanucleus-rdbms.version> + <datanucleus-rdbms.version>5.1.5</datanucleus-rdbms.version> <datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.version> <!-- ISIS-1288: seen integration tests to fail; diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml index 0aa0361..01b7f38 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>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-runtime</artifactId> diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java index e8b2dc0..9b2936a 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java @@ -25,19 +25,6 @@ import java.util.Map; import java.util.Set; import javax.annotation.Nullable; -<<<<<<< dev/2.0.0-M2-cherrypicked -======= -import javax.jdo.annotations.PersistenceCapable; - -import com.google.common.base.Function; -import com.google.common.base.Joiner; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; - -import org.reflections.Reflections; ->>>>>>> e20eec9 ISIS-1728: uses typesafe queries for helloworld import org.apache.isis.applib.AppManifest; import org.apache.isis.applib.annotation.DomainObject; diff --git a/core/schema/pom.xml b/core/schema/pom.xml index eb39ae7..52ac941 100644 --- a/core/schema/pom.xml +++ b/core/schema/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-schema</artifactId> diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml index 13535bb..249459a 100644 --- a/core/security-shiro/pom.xml +++ b/core/security-shiro/pom.xml @@ -23,11 +23,11 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-security-shiro</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Isis Security Shiro</name> @@ -70,7 +70,7 @@ <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-security-shiro</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </dependency> </dependencies> </dependencyManagement> diff --git a/core/security/pom.xml b/core/security/pom.xml index 03fc5e7..cf44483 100644 --- a/core/security/pom.xml +++ b/core/security/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-security</artifactId> diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml index 6ae7e18..a31d9df 100644 --- a/core/specsupport/pom.xml +++ b/core/specsupport/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-specsupport</artifactId> diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml index 49972f5..9c36059 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>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-unittestsupport</artifactId> diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml index e3206ae..ab27a7c 100644 --- a/core/viewer-restfulobjects-applib/pom.xml +++ b/core/viewer-restfulobjects-applib/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-viewer-restfulobjects-applib</artifactId> diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml index 7a9feb3..c581b80 100644 --- a/core/viewer-restfulobjects-rendering/pom.xml +++ b/core/viewer-restfulobjects-rendering/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId> diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml index 1bae1d0..39519ef 100644 --- a/core/viewer-restfulobjects-server/pom.xml +++ b/core/viewer-restfulobjects-server/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-viewer-restfulobjects-server</artifactId> diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml index a415304..11ebfb0 100644 --- a/core/viewer-wicket-applib/pom.xml +++ b/core/viewer-wicket-applib/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-viewer-wicket-applib</artifactId> diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml index 9c11554..33a7f12 100644 --- a/core/viewer-wicket-impl/pom.xml +++ b/core/viewer-wicket-impl/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <name>Apache Isis Wicket Viewer Implementation</name> diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml index aa7a091..7dd62f8 100644 --- a/core/viewer-wicket-model/pom.xml +++ b/core/viewer-wicket-model/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-viewer-wicket-model</artifactId> diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml index edf4621..8b99385 100644 --- a/core/viewer-wicket-ui/pom.xml +++ b/core/viewer-wicket-ui/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-viewer-wicket-ui</artifactId> diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml index 24ec1d8..0ef3631 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>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-webserver</artifactId> diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml index 3d2f9a8..8f839f3 100644 --- a/core/wrapper/pom.xml +++ b/core/wrapper/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>isis-core-wrapper</artifactId> diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml index 002742f..87408e8 100644 --- a/example/application/helloworld/pom.xml +++ b/example/application/helloworld/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.isis.example.application</groupId> <artifactId>helloworld</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>HelloWorld</name> diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml index e46f103..05fb986 100644 --- a/example/application/simpleapp/application/pom.xml +++ b/example/application/simpleapp/application/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.isis.example.application</groupId> <artifactId>simpleapp</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>simpleapp-application</artifactId> diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml index 4910509..c605819 100644 --- a/example/application/simpleapp/module-simple/pom.xml +++ b/example/application/simpleapp/module-simple/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.isis.example.application</groupId> <artifactId>simpleapp</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>simpleapp-module-simple</artifactId> diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml index b2af7e6..ff851e2 100644 --- a/example/application/simpleapp/pom.xml +++ b/example/application/simpleapp/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.isis.example.application</groupId> <artifactId>simpleapp</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>SimpleApp Parent</name> diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml index da6eea8..b1ad666 100644 --- a/example/application/simpleapp/webapp/pom.xml +++ b/example/application/simpleapp/webapp/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.isis.example.application</groupId> <artifactId>simpleapp</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> </parent> <artifactId>simpleapp-webapp</artifactId> diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml index 5f84e1f..a72fb6f 100644 --- a/example/archetype/helloworld/pom.xml +++ b/example/archetype/helloworld/pom.xml @@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.isis.archetype</groupId> <artifactId>helloworld-archetype</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>helloworld-archetype</name> <build> diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index a432bb2..646c9dc 100644 --- a/example/archetype/simpleapp/pom.xml +++ b/example/archetype/simpleapp/pom.xml @@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.isis.archetype</groupId> <artifactId>simpleapp-archetype</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>simpleapp-archetype</name> <build> @@ -70,7 +70,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <relativePath>../../../core/pom.xml</relativePath> </parent> <properties> diff --git a/pom.xml b/pom.xml index b376ff4..7914330 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ <groupId>org.apache.isis</groupId> <artifactId>isis-all</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <packaging>pom</packaging> -- To stop receiving notification emails like this one, please contact ahu...@apache.org.