diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index cb798c0..958a725 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -10,6 +10,12 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 + - name: setup java 11 + uses: actions/setup-java@v3 + id: setup-java + with: + distribution: "temurin" + java-version: "11" - name: Gradle wrapper validation uses: gradle/wrapper-validation-action@v1.0.6 - name: Setup gradle dependency cache diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0c72e1f..e5992fc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,6 +11,12 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 + - name: setup java 11 + uses: actions/setup-java@v3 + id: setup-java + with: + distribution: "temurin" + java-version: "11" - name: Gradle wrapper validation uses: gradle/wrapper-validation-action@v1.0.6 - name: Setup gradle dependency cache diff --git a/build.gradle.kts b/build.gradle.kts index 2473b94..94d8c0b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,7 +52,7 @@ subprojects { } configure { - sourceCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 } ext["xjbOutputDir"] = file("$buildDir/generated-sources/jaxb2") diff --git a/sykmelding-arbeidsgiver/src/main/xsd/sykmeldingArbeidsgiver.xsd b/sykmelding-arbeidsgiver/src/main/xsd/sykmeldingArbeidsgiver.xsd index 247f309..af88606 100644 --- a/sykmelding-arbeidsgiver/src/main/xsd/sykmeldingArbeidsgiver.xsd +++ b/sykmelding-arbeidsgiver/src/main/xsd/sykmeldingArbeidsgiver.xsd @@ -225,12 +225,12 @@ Ikke overlappende perioder - + egenmeldingsdager - + @@ -286,7 +286,7 @@ Sammenhengende, ikke overlappende perioder for denne sykmeldingen. - +