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 2021/03/13 11:44:05 UTC
[isis-app-simpleapp] branch jpa updated: updates to compile with
jdk11, run on jre11
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jpa by this push:
new 29e76bc updates to compile with jdk11, run on jre11
new e07e955 Merge branch 'jdo' into jpa-SNAPSHOT
29e76bc is described below
commit 29e76bcf10a3ac6c09c26c2d0c9758e83bcc8692
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 13 11:33:32 2021 +0000
updates to compile with jdk11, run on jre11
---
pom.xml | 1 +
webapp/pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c6f8492..ed44b75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
<packaging>pom</packaging>
<properties>
+ <java.version>11</java.version>
<maven-cucumber-reporting.version>5.3.0</maven-cucumber-reporting.version>
<archunit.version>0.14.1</archunit.version>
<skipBDD>${skipTests}</skipBDD>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index a4d6c9a..ff662dd 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -148,7 +148,7 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<from>
- <image>openjdk:15-alpine</image>
+ <image>adoptopenjdk/openjdk11:x86_64-alpine-jre-11.0.10_9</image>
</from>
<container>
<jvmFlags>