From 97c887a6e81e9ac0a177add37d5e64c69b573d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= <34712686+asmfstatoil@users.noreply.github.com> Date: Fri, 17 Jun 2022 23:02:42 +0200 Subject: [PATCH] feat: transition from java 8 to java 11 --- .github/workflows/build.yml | 8 ++------ .github/workflows/release.yml | 4 ++-- .github/workflows/workflow.yml | 2 +- pom.xml | 16 ++++++++-------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 480a6166cb..9cbfd48033 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,10 +3,6 @@ name: Build maven on: push: branches: [ master ] - - # pull_request: - # types: [ opened, edited, reopened, review_requested ] - # branches: [ master ] jobs: build: @@ -15,10 +11,10 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Build with Maven run: mvn -B package --file pom.xml # - run: mkdir staging && cp target/*.jar staging diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 29e2976588..58dd48b758 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Get the version id: get_version run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/} diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index e84731ddce..e1b317cbce 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: '11' + java-version: 11 - name: Run tests run: | mvn '-Dtest=!*IntegrationTest' verify -Djacoco.destFile=exportJacoco/jacoco-fast.exec diff --git a/pom.xml b/pom.xml index 1177d8a27b..7384997bab 100644 --- a/pom.xml +++ b/pom.xml @@ -95,12 +95,12 @@ mtj 1.0.4 - - - edu.ucar - netcdf4 - 4.6.16.1 - + + + edu.ucar + netcdf4 + 4.6.16.1 + org.ojalgo ojalgo @@ -190,8 +190,8 @@ maven-compiler-plugin 3.9.0 - 1.8 - 1.8 + 11 + 11 ${project.build.sourceEncoding}