This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 1104837 Improved: Use JDK 17 in GitHub Action, BuildBot (ie OFBiz CI)
and demos (OFBIZ-12729)
1104837 is described below
commit 110483791d1bf640fd15e2d5589c940239c3c444
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Jan 23 17:01:17 2023 +0100
Improved: Use JDK 17 in GitHub Action, BuildBot (ie OFBiz CI) and demos
(OFBIZ-12729)
Uses "SDKMAN!" to handle different versions in demos.
See https://lists.apache.org/thread/8xq5gzn4kgjqsw5748yvpxq1vqopcssx for
details
---
demo-backup/next-manual.sh | 5 ++++-
demo-backup/stable-manual.sh | 5 ++++-
demo-backup/trunk.sh | 5 ++++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/demo-backup/next-manual.sh b/demo-backup/next-manual.sh
index 277f795..4fdcd9c 100755
--- a/demo-backup/next-manual.sh
+++ b/demo-backup/next-manual.sh
@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/bin/bash
echo This cant be used alone, see OFBIZ-10287. You need for now to use
all-manual-nicely.sh
+. ~/.sdkman/bin/sdkman-init.sh
+sdk use java 17.0.2-tem
+
cd /home/ofbizDemo/branch22.01
# checkout patched files before patching them, else git pull would not work
diff --git a/demo-backup/stable-manual.sh b/demo-backup/stable-manual.sh
index f660f20..fed0eda 100755
--- a/demo-backup/stable-manual.sh
+++ b/demo-backup/stable-manual.sh
@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/bin/bash
echo This cant be used alone, see OFBIZ-10287. You need for now to use
all-manual-nicely.sh
+. ~/.sdkman/bin/sdkman-init.sh
+sdk use java 11.0.4-tem
+
cd /home/ofbizDemo/branch18.12
# checkout patched files before patching them, else git pull would not work
diff --git a/demo-backup/trunk.sh b/demo-backup/trunk.sh
index e7e7f9b..77b9b68 100755
--- a/demo-backup/trunk.sh
+++ b/demo-backup/trunk.sh
@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/bin/bash
echo This cant be used alone, see OFBIZ-10287. You need for now to use
all-manual-nicely.sh
+. ~/.sdkman/bin/sdkman-init.sh
+sdk use java 17.0.2-tem
+
cd /home/ofbizDemo/trunk
# checkout patched files before patching them, else git pull would not work
git checkout framework/webapp/config/url.properties
