You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/02/06 06:26:12 UTC
[isis] branch v1-lab updated: fixes build and run
(helloworld+simpleapp) on jdk-8, adds some readme to helloworld
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v1-lab
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v1-lab by this push:
new 6f4106c fixes build and run (helloworld+simpleapp) on jdk-8, adds some readme to helloworld
6f4106c is described below
commit 6f4106c0d9b191cbbd5c33009d3fd3237ae8a4c3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Feb 6 07:26:00 2021 +0100
fixes build and run (helloworld+simpleapp) on jdk-8, adds some readme to
helloworld
---
core/pom.xml | 2 +-
example/application/helloworld/README.adoc | 27 +++++++++++++++++++++++++++
example/application/helloworld/pom.xml | 3 +++
example/application/simpleapp/webapp/pom.xml | 3 +++
4 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/core/pom.xml b/core/pom.xml
index 3341ccb..3a91fbd 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -136,7 +136,7 @@
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
<resteasy-jaxrs.version>3.0.24.Final</resteasy-jaxrs.version>
- <jetty.version>9.4.3.v20170317</jetty.version>
+ <jetty.version>9.4.36.v20210114</jetty.version>
<wicket.version>7.9.0</wicket.version>
<wicketstuff.version>7.8.1</wicketstuff.version>
diff --git a/example/application/helloworld/README.adoc b/example/application/helloworld/README.adoc
index 575ac2a..7cc74c6 100644
--- a/example/application/helloworld/README.adoc
+++ b/example/application/helloworld/README.adoc
@@ -3,6 +3,30 @@
This application was generated by the link:http://isis.apache.org[Apache Isis] link:http://isis.apache.org/guides/ugfun.html#_ugfun_getting-started_helloworld-archetype[helloworld archetype].
It is intended as a starting point to learn what Apache Isis is all about.
+== Laboratory Branch
+
+NOTE: Modified to build and run on JDK-8
+
+On Windows 10 (20H2+) you can use powershell to run maven commands.
+
+Ensure you have a working maven that's using JDK version 8
+
+[source,sh]
+.powershell: setup the java jdk to use for this session
+----
+$env:JAVA_HOME='d:/opt/jdk8'
+----
+
+[source,sh]
+.verify JDK version
+----
+mvn -v
+
+Apache Maven 3.6.3
+Maven home: ...
+Java version: 1.8.0_271, vendor: ...
+...
+----
== Quick start
@@ -27,4 +51,7 @@ Login using:
The app runs with HSQLDB running in-memory.
+
+
+
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index a669780..6190c30 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -50,6 +50,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <!-- override version from mixin -->
+ <jetty-maven-plugin.version>9.4.36.v20210114</jetty-maven-plugin.version>
+
<maven-war-plugin.warName>${project.artifactId}</maven-war-plugin.warName>
</properties>
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 0141eed..c5802b5 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -42,6 +42,9 @@
${basedir}/src/main/jettyconsole/isis-banner.png
</jetty-console-maven-plugin.backgroundImage>
+ <!-- override version from mixin -->
+ <jetty-maven-plugin.version>9.4.36.v20210114</jetty-maven-plugin.version>
+
<maven-war-plugin.warName>${project.parent.artifactId}</maven-war-plugin.warName>
<docker-plugin.imageName>DOCKER_REGISTRY_ACCOUNT/${project.parent.artifactId}</docker-plugin.imageName>