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/09/14 16:11:46 UTC
[isis] 05/19: merge - fixes up issues in pom files (version)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5400a32a35ed4a87a3f32abb0a94edee0f954a42
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Sep 14 16:17:23 2018 +0100
merge - fixes up issues in pom files (version)
---
core/pom.xml | 4 ----
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
recreate_archetype_RELEASE.sh | 6 +++---
recreate_archetype_SNAPSHOT.sh | 6 +++---
5 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 09d4134..0f7e3b8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -46,12 +46,8 @@
<inceptionYear>2010</inceptionYear>
<properties>
-<<<<<<< HEAD
<revision>2.0.0-M2-SNAPSHOT</revision>
-=======
- <revision>1.16.3-SNAPSHOT</revision>
<isis.version>${revision}</isis.version>
->>>>>>> master
<jar-plugin.automaticModuleName>org.apache.isis.core</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/core</git-plugin.propertiesDir>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index 3c7a73a..a695055 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -36,7 +36,7 @@
<packaging>war</packaging>
<properties>
- <revision>2.0.0-M1</revision>
+ <revision>2.0.0-M2-SNAPSHOT</revision>
<isis.version>${revision}</isis.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index a50ad68..f772538 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -36,7 +36,7 @@
<packaging>pom</packaging>
<properties>
- <revision>2.0.0-M1</revision>
+ <revision>2.0.0-M2-SNAPSHOT</revision>
<isis.version>${revision}</isis.version>
<lombok.version>[1.18,)</lombok.version>
diff --git a/recreate_archetype_RELEASE.sh b/recreate_archetype_RELEASE.sh
index 5113ba5..fd7d0ad 100644
--- a/recreate_archetype_RELEASE.sh
+++ b/recreate_archetype_RELEASE.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
-export ISISREL=1.16.3
-export ISISDEV=1.16.4-SNAPSHOT
-export JIRA=ISIS-1916
+export ISISREL=2.0.0-M2
+export ISISDEV=2.0.0-M3-SNAPSHOT
+export JIRA=ISIS-1811
export ISISTMP=/c/tmp # or as required
export ISISPAR=$ISISREL
diff --git a/recreate_archetype_SNAPSHOT.sh b/recreate_archetype_SNAPSHOT.sh
index 3ecd2fb..c4d9705 100644
--- a/recreate_archetype_SNAPSHOT.sh
+++ b/recreate_archetype_SNAPSHOT.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
-export ISISREL=1.16.3-SNAPSHOT
-export ISISDEV=1.16.3-SNAPSHOT
-export JIRA=ISIS-1916
+export ISISREL=2.0.0-M2-SNAPSHOT
+export ISISDEV=2.0.0-M2-SNAPSHOT
+export JIRA=ISIS-1811
export ISISTMP=/c/tmp # or as required
export ISISPAR=$ISISREL