This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch ISIS-1976-rethink-object-adapters
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 36966163e275f207ae0c25171a71f31049ce3a4c
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Fri Sep 7 19:43:47 2018 +0200
ISIS-1899: post release ... trying to fix CI build
simple-app/helloworld ... override all DN-5 dependency versions as
provided by incode parent pom
---
example/application/helloworld/pom.xml | 12 +++++++++---
example/application/simpleapp/pom.xml | 12 ++++++++++--
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/example/application/helloworld/pom.xml
b/example/application/helloworld/pom.xml
index ee0fcbe..50e957f 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -43,9 +43,15 @@
<compiler-plugin.target>1.8</compiler-plugin.target>
<compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
- <!-- override incode-build -->
- <datanucleus-core.version>5.1.11</datanucleus-core.version>
-
+ <!-- workaround for DN enhancer failing with already registered
bundle in case
+ the mixin at
https://github.com/danhaywood/java-mavenmixin-datanucleusenhance/blob/master/pom.xml
+ has different DN versions than Isis' core.
+ -->
+
<mavenmixin-datanucleusenhance.version>0.0.5</mavenmixin-datanucleusenhance.version>
+
<datanucleus-maven-plugin.version>5.0.2</datanucleus-maven-plugin.version>
+ <datanucleus-core.version>5.1.11</datanucleus-core.version>
+ <datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
+
<datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.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 9a41b13..c1f5a83 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -45,8 +45,16 @@
<compiler-plugin.target>1.8</compiler-plugin.target>
<compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
- <!-- override incode-build -->
- <datanucleus-core.version>5.1.11</datanucleus-core.version>
+ <!-- workaround for DN enhancer failing with already registered bundle
in case
+ the mixin at
https://github.com/danhaywood/java-mavenmixin-datanucleusenhance/blob/master/pom.xml
+ has different DN versions than Isis' core.
+ -->
+
<mavenmixin-datanucleusenhance.version>0.0.5</mavenmixin-datanucleusenhance.version>
+
<datanucleus-maven-plugin.version>5.0.2</datanucleus-maven-plugin.version>
+ <datanucleus-core.version>5.1.11</datanucleus-core.version>
+ <datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
+
<datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.version>
+
<hsqldb.version>2.3.4</hsqldb.version>
