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 2018/03/09 15:07:18 UTC
[isis] 01/02: ISIS-1904: parameterized using ${revison}
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit aac0927a683da197cba8eaa9b2b1ca8a6502e20d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 9 15:06:12 2018 +0000
ISIS-1904: parameterized using ${revison}
---
.gitlab-ci.yml | 2 +-
adocs/documentation/pom.xml | 2 +-
core/applib-legacy/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-legacy/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/plugins/discovery-reflections/pom.xml | 2 +-
core/plugins/eventbus-axon/pom.xml | 2 +-
core/plugins/eventbus-guava/pom.xml | 2 +-
core/plugins/jaxrs-resteasy-3/pom.xml | 2 +-
core/plugins/jaxrs-resteasy-4/pom.xml | 2 +-
core/plugins/jdo-datanucleus-4/pom.xml | 2 +-
core/plugins/jdo-datanucleus-5/pom.xml | 2 +-
core/pom.xml | 100 ++++++++++-----------
core/runtime-legacy/pom.xml | 2 +-
core/runtime/pom.xml | 2 +-
core/schema/pom.xml | 2 +-
core/security-shiro/pom.xml | 4 +-
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-legacy/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 | 14 +--
example/application/simpleapp/application/pom.xml | 5 +-
.../application/simpleapp/module-simple/pom.xml | 12 +--
example/application/simpleapp/pom.xml | 7 +-
example/application/simpleapp/webapp/pom.xml | 4 +-
42 files changed, 110 insertions(+), 106 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18071dc..372bf24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,5 +4,5 @@ stages:
maven-build:
image: maven:3-jdk-8
stage: build
- script: "mvn package -B"
+ script: "mvn clean package -B -Dskip.arch -D revision=2.0.0-M1.$(date +%Y%m%d)-$(git rev-parse --short HEAD)"
diff --git a/adocs/documentation/pom.xml b/adocs/documentation/pom.xml
index 960a2e4..3dedadf 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>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Isis Docs</name>
diff --git a/core/applib-legacy/pom.xml b/core/applib-legacy/pom.xml
index dba1a2e..898728a 100644
--- a/core/applib-legacy/pom.xml
+++ b/core/applib-legacy/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-applib-legacy</artifactId>
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index d4f471a..5463f9b 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>${revision}</version>
</parent>
<artifactId>isis-core-applib</artifactId>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 00b1968..36e0b7c 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>${revision}</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index e1ba436..f52a7a2 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>${revision}</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 3e3646b..5620e29 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>${revision}</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index 7a387b6..00d5ac5 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>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 6256139..4740d4c 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>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index 2f870cd..cd99aeb 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>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/metamodel-legacy/pom.xml b/core/metamodel-legacy/pom.xml
index 7e4ccb2..a7e6823 100644
--- a/core/metamodel-legacy/pom.xml
+++ b/core/metamodel-legacy/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-metamodel-legacy</artifactId>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 4b0d05e..56a6e12 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>${revision}</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
diff --git a/core/plugins/discovery-reflections/pom.xml b/core/plugins/discovery-reflections/pom.xml
index 4936532..9d747be 100644
--- a/core/plugins/discovery-reflections/pom.xml
+++ b/core/plugins/discovery-reflections/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/plugins/eventbus-axon/pom.xml b/core/plugins/eventbus-axon/pom.xml
index d2e62a1..76e5005 100644
--- a/core/plugins/eventbus-axon/pom.xml
+++ b/core/plugins/eventbus-axon/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/plugins/eventbus-guava/pom.xml b/core/plugins/eventbus-guava/pom.xml
index 66662cd..8e7b4c4 100644
--- a/core/plugins/eventbus-guava/pom.xml
+++ b/core/plugins/eventbus-guava/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/plugins/jaxrs-resteasy-3/pom.xml b/core/plugins/jaxrs-resteasy-3/pom.xml
index 7c0d33c..397d1a1 100644
--- a/core/plugins/jaxrs-resteasy-3/pom.xml
+++ b/core/plugins/jaxrs-resteasy-3/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/plugins/jaxrs-resteasy-4/pom.xml b/core/plugins/jaxrs-resteasy-4/pom.xml
index 1399419..6f5488a 100644
--- a/core/plugins/jaxrs-resteasy-4/pom.xml
+++ b/core/plugins/jaxrs-resteasy-4/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/plugins/jdo-datanucleus-4/pom.xml b/core/plugins/jdo-datanucleus-4/pom.xml
index 9a17d68..4fdb49b 100644
--- a/core/plugins/jdo-datanucleus-4/pom.xml
+++ b/core/plugins/jdo-datanucleus-4/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/plugins/jdo-datanucleus-5/pom.xml b/core/plugins/jdo-datanucleus-5/pom.xml
index 5446933..3a67439 100644
--- a/core/plugins/jdo-datanucleus-5/pom.xml
+++ b/core/plugins/jdo-datanucleus-5/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/pom.xml b/core/pom.xml
index d5b9767..8ae4778 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>${revision}</version>
<packaging>pom</packaging>
@@ -45,12 +45,9 @@
<inceptionYear>2010</inceptionYear>
- <prerequisites>
- <maven>3.0.4</maven>
- </prerequisites>
-
<properties>
- <isis-core.version>2.0.0-M1-SNAPSHOT</isis-core.version>
+ <revision>2.0.0-M1-SNAPSHOT</revision>
+
<jar-plugin.automaticModuleName>org.apache.isis.core</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/core</git-plugin.propertiesDir>
@@ -998,21 +995,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.3.1</version>
+ <version>3.0.0-M1</version>
<configuration>
<rules>
<requireMavenVersion>
- <version>[3.0.4,)</version>
+ <version>[3.5.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.8.0,)</version>
</requireJavaVersion>
+ <!--
+ seemingly not compatible with use of ${revision} placeholders
<requirePluginVersions>
<message>All plugin versions must be
defined!</message>
<banLatest>true</banLatest>
<banRelease>true</banRelease>
</requirePluginVersions>
+ -->
<DependencyConvergence />
</rules>
</configuration>
@@ -1183,12 +1183,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1197,14 +1197,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1213,14 +1213,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib-legacy</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib-legacy</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1243,14 +1243,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1259,7 +1259,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1268,14 +1268,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1284,14 +1284,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel-legacy</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel-legacy</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1300,12 +1300,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1314,12 +1314,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime-legacy</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime-legacy</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1328,12 +1328,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1342,57 +1342,57 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Restful Objects viewer -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1401,12 +1401,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
@@ -1414,41 +1414,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1457,26 +1457,26 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Maven dependencies -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-intellij</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
- <version>${isis-core.version}</version>
+ <version>${revision}</version>
<type>pom</type>
</dependency>
@@ -2246,8 +2246,8 @@ ${license.additional-notes}
</profiles>
<modules>
- <module>applib</module>
<module>schema</module>
+ <module>applib</module>
<module>log4j</module>
<module>metamodel</module>
<module>runtime</module>
diff --git a/core/runtime-legacy/pom.xml b/core/runtime-legacy/pom.xml
index 8dc97b2..9940902 100644
--- a/core/runtime-legacy/pom.xml
+++ b/core/runtime-legacy/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-runtime-legacy</artifactId>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 6beb419..cfafe0c 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index eb39ae7..59f14ee 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>${revision}</version>
</parent>
<artifactId>isis-core-schema</artifactId>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 4132412..48a9e4e 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-security-shiro</artifactId>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 03fc5e7..8a91cbd 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>${revision}</version>
</parent>
<artifactId>isis-core-security</artifactId>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 6ae7e18..1bf20da 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>${revision}</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 62e2e15..d29a2fa 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>${revision}</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index b16a281..5edf177 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>${revision}</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 3ae7315..f57b81f 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>${revision}</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 fa75921..93aeb6a 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>${revision}</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..279314e 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>${revision}</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 03868d4..944578f 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>${revision}</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..a5fd715 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>${revision}</version>
</parent>
<artifactId>isis-core-viewer-wicket-model</artifactId>
diff --git a/core/viewer-wicket-ui-legacy/pom.xml b/core/viewer-wicket-ui-legacy/pom.xml
index c110357..d125170 100644
--- a/core/viewer-wicket-ui-legacy/pom.xml
+++ b/core/viewer-wicket-ui-legacy/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
</parent>
<artifactId>isis-core-viewer-wicket-ui-legacy</artifactId>
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index fb9abb2..337db00 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>${revision}</version>
</parent>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 45e16b0..7ad14c9 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>${revision}</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 3d2f9a8..90cf370 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>${revision}</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index 308060d..01ff078 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -29,14 +29,14 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>helloworld</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
<name>HelloWorld</name>
<packaging>war</packaging>
<properties>
- <isis.version>2.0.0-M1-SNAPSHOT</isis.version>
+ <revision>2.0.0-M1-SNAPSHOT</revision>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -171,25 +171,25 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-discovery-reflections</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-eventbus-guava</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- TESTS -->
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index e46f103..fe10399 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>${revision}</version>
</parent>
<artifactId>simpleapp-application</artifactId>
@@ -33,6 +33,9 @@
<packaging>jar</packaging>
+ <properties>
+ <revision>2.0.0-M1-SNAPSHOT</revision>
+ </properties>
<build>
<resources>
<resource>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 0c3d285..67124ad 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>${revision}</version>
</parent>
<artifactId>simpleapp-module-simple</artifactId>
@@ -109,7 +109,7 @@
<plugin>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
<executions>
<execution>
<phase>test</phase>
@@ -151,25 +151,25 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-discovery-reflections</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-eventbus-guava</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- TESTS -->
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 087544d..7076945 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -29,14 +29,15 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>${revision}</version>
<name>SimpleApp Parent</name>
<packaging>pom</packaging>
<properties>
- <isis.version>2.0.0-M1-SNAPSHOT</isis.version>
+ <revision>2.0.0-M1-SNAPSHOT</revision>
+
<lombok.version>1.16.20</lombok.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
@@ -132,7 +133,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index da6eea8..7572a6f 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>${revision}</version>
</parent>
<artifactId>simpleapp-webapp</artifactId>
@@ -105,7 +105,7 @@
<plugin>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>${isis.version}</version>
+ <version>${revision}</version>
<executions>
<execution>
<phase>package</phase>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.