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:53 UTC
[isis] 12/19: merge - overrides incode-build props for DN for
helloworld and simpleapp
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 3214c81631b1a83c4c9a7c51da39e9dce00e2e86
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Sep 14 16:31:03 2018 +0100
merge - overrides incode-build props for DN for helloworld and simpleapp
---
example/application/helloworld/pom.xml | 5 +++--
example/application/simpleapp/pom.xml | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index a695055..041a85d 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -43,8 +43,9 @@
<compiler-plugin.target>1.8</compiler-plugin.target>
<compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
- <!-- override incode-build -->
- <datanucleus-core.version>5.1.6</datanucleus-core.version>
+ <!-- override incode-build (see dn5-xxx.version in isis-core-plugins-jdo-datanucleus-5) -->
+ <datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
+ <datanucleus-core.version>5.1.11</datanucleus-core.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index f772538..d7d7878 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -45,9 +45,9 @@
<compiler-plugin.target>1.8</compiler-plugin.target>
<compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
- <!-- override incode-build -->
- <datanucleus-core.version>5.1.6</datanucleus-core.version>
-
+ <!-- override incode-build (see dn5-xxx.version in isis-core-plugins-jdo-datanucleus-5) -->
+ <datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
+ <datanucleus-core.version>5.1.11</datanucleus-core.version>
<hsqldb.version>2.3.4</hsqldb.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>