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/09/07 08:27:54 UTC
isis git commit: ISIS-1195: tiny updates to simpleapp and docs
Repository: isis
Updated Branches:
refs/heads/master bafce5535 -> b4a08de11
ISIS-1195: tiny updates to simpleapp and docs
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b4a08de1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b4a08de1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b4a08de1
Branch: refs/heads/master
Commit: b4a08de111c3f8e2502a29d4574301b3c537b841
Parents: bafce55
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 7 07:27:42 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 7 07:27:42 2015 +0100
----------------------------------------------------------------------
adocs/documentation/pom.xml | 2 +-
example/application/simpleapp/dom/pom.xml | 6 ++++--
.../src/main/resources/archetype-resources/dom/pom.xml | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b4a08de1/adocs/documentation/pom.xml
----------------------------------------------------------------------
diff --git a/adocs/documentation/pom.xml b/adocs/documentation/pom.xml
index 32951b1..6a86dce 100644
--- a/adocs/documentation/pom.xml
+++ b/adocs/documentation/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.apache.isis.docs</groupId>
<artifactId>isis-documentation</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Isis Docs</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/b4a08de1/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index 5e5970d..dae6495 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -79,7 +79,9 @@
<profile>
<id>enhance</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!skip.enhance</name>
+ </property>
</activation>
<properties>
<datanucleus-maven-plugin.version>4.0.1</datanucleus-maven-plugin.version>
@@ -161,7 +163,7 @@
<plugin>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>${isis.version}</version>
<configuration>
<isisConfigDir>../webapp/src/main/webapp/WEB-INF</isisConfigDir>
</configuration>
http://git-wip-us.apache.org/repos/asf/isis/blob/b4a08de1/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 49527a7..0a25a19 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
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp-dom</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>${isis.version}</version>
</dependency>
<!--
... workaround to avoid conflict with plexus-default