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 2015/04/08 22:48:20 UTC
[6/6] isis git commit: ISIS-789: recreating simpleapp archetype
ISIS-789: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/61493de4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/61493de4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/61493de4
Branch: refs/heads/ISIS-789
Commit: 61493de43d1421fcc9dadf6176437f0d01963fa6
Parents: 412b2d4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Apr 8 21:09:49 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Apr 8 21:09:49 2015 +0100
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 2 +-
.../src/main/resources/archetype-resources/dom/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 11 -----------
.../test/resources/projects/basic/archetype.properties | 2 +-
4 files changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/61493de4/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index e6a4d26..d65e62c 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>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
http://git-wip-us.apache.org/repos/asf/isis/blob/61493de4/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
index 23a3d55..01e784b 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
@@ -154,7 +154,7 @@
<dependency>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp-dom</artifactId>
- <version>${isis.version}</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<!--
... workaround to avoid conflict with plexus-default
http://git-wip-us.apache.org/repos/asf/isis/blob/61493de4/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index 26da89d..8dea042 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -34,17 +34,6 @@
<properties>
<isis.version>1.9.0_dn4-SNAPSHOT</isis.version>
- <!-- must be consistent with the versions defined by the JDO Objectstore -->
-
- <!--<jdo-api.version>3.1-rc1</jdo-api.version>-->
- <datanucleus-core.version>4.0.6</datanucleus-core.version>
- <datanucleus-api-jdo.version>4.0.5</datanucleus-api-jdo.version>
- <datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
- <!--<datanucleus-jdo-query.version>4.0.4</datanucleus-jdo-query.version>-->
- <!--<datanucleus-rdbms.version>4.0.11</datanucleus-rdbms.version>-->
-
- <!--<datanucleus-jodatime.version>4.0.6</datanucleus-jodatime.version>-->
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
http://git-wip-us.apache.org/repos/asf/isis/blob/61493de4/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index ada4e85..6995dbc 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Tue Apr 07 07:41:20 BST 2015
+#Wed Apr 08 21:09:42 BST 2015
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it