diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f08b84b9f6..fa1e33f3bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,6 @@ jobs: strategy: matrix: java: - - '11' - '17' steps: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b6ec8bd7c..b5c48466d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ # limitations under the License. # -image: maven:3.8.6-jdk-11 +image: maven:3.8.6-eclipse-temurin-17 stages: - build diff --git a/CHANGELOG.md b/CHANGELOG.md index ddcd315ca0..8579da27c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ This is intended as an overview of the major changes v7.5.0-SNAPSHOT === +- Build + - Because of dependencies and plugins the build now requires Java 17. - New/improved detections - Report frozen Mac OS as `Mac OS >=10.15.7` for all browsers (Chrome, Firefox, etc.). - Ekioh Flow browser diff --git a/devtools/docker/env.sh b/devtools/docker/env.sh index 0f4e0b5e9f..f6d4a97a63 100755 --- a/devtools/docker/env.sh +++ b/devtools/docker/env.sh @@ -34,7 +34,7 @@ alias switch-jdk11="__INTERNAL__SwitchJDK 1.11.0; export JDK_VERSION=JDK-11" alias switch-jdk17="__INTERNAL__SwitchJDK 1.17.0 ; export JDK_VERSION=JDK-17" #alias switch-jdk13="__INTERNAL__SwitchJDK latest; export JDK_VERSION=JDK-13" -switch-jdk11 +switch-jdk17 . "/usr/lib/git-core/git-sh-prompt" export PS1='\['${IBlue}${On_Black}'\] \u@\['${IWhite}${On_Red}'\][Yauaa Builder \['${BWhite}${On_Blue}'\]<'\${JDK_VERSION}'>\['${IWhite}${On_Red}'\]]\['${IBlue}${On_Black}'\]:\['${Cyan}${On_Black}'\]\w$(declare -F __git_ps1 &>/dev/null && __git_ps1 " \['${BIPurple}'\]{\['${BIGreen}'\]%s\['${BIPurple}'\]}")\['${BIBlue}'\] ]\['${Color_Off}'\]\n$ ' diff --git a/documentation/content/developer/Building.md b/documentation/content/developer/Building.md index 503f7bc9c2..b538f0e6c4 100644 --- a/documentation/content/developer/Building.md +++ b/documentation/content/developer/Building.md @@ -5,7 +5,7 @@ weight = 10 ## Building Requirements: - A Linux class machine (can be a VM) -- The normal build tools for a Java project (i.e. maven 3.6+ and jdk 11) +- The normal build tools for a Java project (i.e. Maven 3.6+ and jdk 17) - The `./start-docker.sh` script launches a docker based build environment with all needed tools. and then simply do: