From ea63ef90dcd45f00b45fa8c72e26b50be31ba63f Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 21 May 2025 13:15:21 +0200 Subject: [PATCH 1/9] Prepare for v4 --- .github/workflows/publish.yaml | 12 ++++---- .gitignore | 1 + Jenkinsfile | 30 ------------------- build.gradle | 9 ++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../model/FintAbstractObject.java | 2 +- .../model/FintComplexDatatypeObject.java | 2 +- .../model/FintIdentifikator.java | 2 +- .../model/FintMainObject.java | 4 +-- .../model/FintModelObject.java | 2 +- .../model/FintMultiplicity.java | 2 +- .../no/{fint => novari}/model/FintObject.java | 2 +- .../{fint => novari}/model/FintReference.java | 2 +- .../{fint => novari}/model/FintRelation.java | 2 +- 14 files changed, 24 insertions(+), 50 deletions(-) delete mode 100644 Jenkinsfile rename src/main/java/no/{fint => novari}/model/FintAbstractObject.java (67%) rename src/main/java/no/{fint => novari}/model/FintComplexDatatypeObject.java (69%) rename src/main/java/no/{fint => novari}/model/FintIdentifikator.java (97%) rename src/main/java/no/{fint => novari}/model/FintMainObject.java (94%) rename src/main/java/no/{fint => novari}/model/FintModelObject.java (87%) rename src/main/java/no/{fint => novari}/model/FintMultiplicity.java (98%) rename src/main/java/no/{fint => novari}/model/FintObject.java (94%) rename src/main/java/no/{fint => novari}/model/FintReference.java (67%) rename src/main/java/no/{fint => novari}/model/FintRelation.java (98%) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 432c396..deac8eb 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -9,19 +9,19 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set version run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF#refs/*/} | sed "s/^v//")" >> $GITHUB_ENV - - name: Set up JDK 8 - uses: actions/setup-java@v2 + - name: Set up JDK 21 + uses: actions/setup-java@v4 with: - java-version: '8' + java-version: '21' distribution: 'adopt' - name: Gradle Wrapper Validation - uses: gradle/wrapper-validation-action@v1.0.4 + uses: gradle/wrapper-validation-action@v2 - name: Gradle Build Action - uses: gradle/gradle-build-action@v2.1.3 + uses: gradle/gradle-build-action@v2 with: arguments: | publish diff --git a/.gitignore b/.gitignore index b446de2..b7f51d2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /*.ipr /*.iml /.vscode/ +.java-version diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 97d6538..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,30 +0,0 @@ -pipeline { - agent { - docker { - label 'docker' - image 'gradle:4.6.0-jdk8-alpine' - } - } - stages { - stage('Build') { - steps { - sh 'gradle --no-daemon clean build' - } - } - stage('Deploy') { - environment { - REPOSILITE = credentials('reposilite') - } - when { - tag pattern: "v\\d+\\.\\d+\\.\\d+(-\\w+-\\d+)?", comparator: "REGEXP" - } - steps { - script { - VERSION = TAG_NAME[1..-1] - } - sh "echo Version is ${VERSION}" - sh "gradle --no-daemon -Pversion=${VERSION} -PreposiliteUsername=${REPOSILITE_USR} -PreposiliteToken=${REPOSILITE_PSW} publish" - } - } - } -} diff --git a/build.gradle b/build.gradle index c92a1c2..8fe6280 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,13 @@ plugins { apply plugin: 'java' apply plugin: 'maven-publish' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +group = 'no.novari' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} repositories { mavenLocal() diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d047364..ca025c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/no/fint/model/FintAbstractObject.java b/src/main/java/no/novari/model/FintAbstractObject.java similarity index 67% rename from src/main/java/no/fint/model/FintAbstractObject.java rename to src/main/java/no/novari/model/FintAbstractObject.java index f93bdd7..5cac851 100644 --- a/src/main/java/no/fint/model/FintAbstractObject.java +++ b/src/main/java/no/novari/model/FintAbstractObject.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.model; public interface FintAbstractObject extends FintObject { } diff --git a/src/main/java/no/fint/model/FintComplexDatatypeObject.java b/src/main/java/no/novari/model/FintComplexDatatypeObject.java similarity index 69% rename from src/main/java/no/fint/model/FintComplexDatatypeObject.java rename to src/main/java/no/novari/model/FintComplexDatatypeObject.java index c62dd68..381982d 100644 --- a/src/main/java/no/fint/model/FintComplexDatatypeObject.java +++ b/src/main/java/no/novari/model/FintComplexDatatypeObject.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.model; public interface FintComplexDatatypeObject extends FintObject { } diff --git a/src/main/java/no/fint/model/FintIdentifikator.java b/src/main/java/no/novari/model/FintIdentifikator.java similarity index 97% rename from src/main/java/no/fint/model/FintIdentifikator.java rename to src/main/java/no/novari/model/FintIdentifikator.java index b396eb5..849c68e 100644 --- a/src/main/java/no/fint/model/FintIdentifikator.java +++ b/src/main/java/no/novari/model/FintIdentifikator.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.model; /** * Represents an identifikator within the Fint model. diff --git a/src/main/java/no/fint/model/FintMainObject.java b/src/main/java/no/novari/model/FintMainObject.java similarity index 94% rename from src/main/java/no/fint/model/FintMainObject.java rename to src/main/java/no/novari/model/FintMainObject.java index 4a32f8e..aab6795 100644 --- a/src/main/java/no/fint/model/FintMainObject.java +++ b/src/main/java/no/novari/model/FintMainObject.java @@ -1,7 +1,5 @@ -package no.fint.model; +package no.novari.model; -import java.util.ArrayList; -import java.util.List; import java.util.Map; /** diff --git a/src/main/java/no/fint/model/FintModelObject.java b/src/main/java/no/novari/model/FintModelObject.java similarity index 87% rename from src/main/java/no/fint/model/FintModelObject.java rename to src/main/java/no/novari/model/FintModelObject.java index 1d8dac9..b07477e 100644 --- a/src/main/java/no/fint/model/FintModelObject.java +++ b/src/main/java/no/novari/model/FintModelObject.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.model; public interface FintModelObject extends FintMainObject { diff --git a/src/main/java/no/fint/model/FintMultiplicity.java b/src/main/java/no/novari/model/FintMultiplicity.java similarity index 98% rename from src/main/java/no/fint/model/FintMultiplicity.java rename to src/main/java/no/novari/model/FintMultiplicity.java index 80c76a7..08e8be6 100644 --- a/src/main/java/no/fint/model/FintMultiplicity.java +++ b/src/main/java/no/novari/model/FintMultiplicity.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.model; /** * Enumerates the possible multiplicities of relationships in the Fint model. diff --git a/src/main/java/no/fint/model/FintObject.java b/src/main/java/no/novari/model/FintObject.java similarity index 94% rename from src/main/java/no/fint/model/FintObject.java rename to src/main/java/no/novari/model/FintObject.java index 3898243..97f3072 100644 --- a/src/main/java/no/fint/model/FintObject.java +++ b/src/main/java/no/novari/model/FintObject.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.model; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/no/fint/model/FintReference.java b/src/main/java/no/novari/model/FintReference.java similarity index 67% rename from src/main/java/no/fint/model/FintReference.java rename to src/main/java/no/novari/model/FintReference.java index a552e69..8276558 100644 --- a/src/main/java/no/fint/model/FintReference.java +++ b/src/main/java/no/novari/model/FintReference.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.model; public interface FintReference extends FintObject { diff --git a/src/main/java/no/fint/model/FintRelation.java b/src/main/java/no/novari/model/FintRelation.java similarity index 98% rename from src/main/java/no/fint/model/FintRelation.java rename to src/main/java/no/novari/model/FintRelation.java index 4095bb0..6ffd320 100644 --- a/src/main/java/no/fint/model/FintRelation.java +++ b/src/main/java/no/novari/model/FintRelation.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.model; /** * Represents a relation between Fint model objects. From ddcccc074b3e807aab81c7f4bfea861d4efab94d Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 21 May 2025 13:31:02 +0200 Subject: [PATCH 2/9] Removed config for reposilite --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8fe6280..32710ac 100644 --- a/build.gradle +++ b/build.gradle @@ -32,5 +32,3 @@ javadoc { options.windowTitle = 'FINT Model Core' destinationDir = file('./javadocs/') } - -apply from: 'https://raw.githubusercontent.com/FINTLabs/fint-buildscripts/master/reposilite.ga.gradle' From 8bcc9d164fbad9ab96a073d7d32c704bb1d2a98a Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 21 May 2025 13:37:52 +0200 Subject: [PATCH 3/9] Reposilite config is back --- build.gradle | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 32710ac..bdc9e21 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ repositories { dependencies { implementation 'javax.validation:validation-api:2.0.1.Final' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.1' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0' } javadoc { @@ -32,3 +32,23 @@ javadoc { options.windowTitle = 'FINT Model Core' destinationDir = file('./javadocs/') } + +publishing { + repositories { + maven { + url "https://repo.fintlabs.no/releases" + credentials { + username = System.getenv("REPOSILITE_USERNAME") + password = System.getenv("REPOSILITE_PASSWORD") + } + authentication { + basic(BasicAuthentication) + } + } + } + publications { + maven(MavenPublication) { + from(components.java) + } + } +} \ No newline at end of file From d142cdcf056805509c1f667b5d024544bb51e9b6 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 28 May 2025 14:12:46 +0200 Subject: [PATCH 4/9] Upgrade dependencies + dependabot + build.yaml --- .github/dependabot.yaml | 12 ++++++++++++ .github/workflows/build.yaml | 23 +++++++++++++++++++++++ .github/workflows/publish.yaml | 3 +-- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 .github/dependabot.yaml create mode 100644 .github/workflows/build.yaml diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 0000000..be541e4 --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,12 @@ +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..3f13ccc --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,23 @@ +name: Build + +on: + push: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v4 + + - name: Setup Java + uses: actions/setup-java@v4 + with: + distribution: 'adopt' + java-version: 21 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Build with Gradle + run: ./gradlew build \ No newline at end of file diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index deac8eb..71953fc 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -24,8 +24,7 @@ jobs: uses: gradle/gradle-build-action@v2 with: arguments: | - publish - -Pversion=${{ env.RELEASE_VERSION }} + publish -Pversion=${{ env.RELEASE_VERSION }} env: REPOSILITE_USERNAME: ${{ secrets.REPOSILITE_USERNAME }} REPOSILITE_PASSWORD: ${{ secrets.REPOSILITE_PASSWORD }} \ No newline at end of file diff --git a/build.gradle b/build.gradle index bdc9e21..8b40af9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ plugins { - id 'com.github.ben-manes.versions' version '0.21.0' + id 'com.github.ben-manes.versions' version '0.51.0' } apply plugin: 'java' apply plugin: 'maven-publish' -group = 'no.novari' +project.group = 'no.novari' java { toolchain { @@ -23,7 +23,7 @@ repositories { dependencies { implementation 'javax.validation:validation-api:2.0.1.Final' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.19.0' } javadoc { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c8..6925085 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From f87b18ac037a198c811c67c7fe1eeba9b016cb53 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 28 May 2025 14:23:12 +0200 Subject: [PATCH 5/9] Java 11 --- .github/workflows/build.yaml | 2 +- .github/workflows/publish.yaml | 2 +- build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3f13ccc..3c0c6e8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,7 +14,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: 21 + java-version: 11 - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 71953fc..0fe610a 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -15,7 +15,7 @@ jobs: - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '11' distribution: 'adopt' - name: Gradle Wrapper Validation uses: gradle/wrapper-validation-action@v2 diff --git a/build.gradle b/build.gradle index 8b40af9..8a11a08 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ project.group = 'no.novari' java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(11) } } From cc5a33a4f3a0f766f8836bbcbf73fdcf1c51d3e6 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Mon, 2 Jun 2025 15:02:11 +0200 Subject: [PATCH 6/9] Updated publish.yaml --- .github/workflows/publish.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 0fe610a..2185c4e 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -10,21 +10,22 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Set version run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF#refs/*/} | sed "s/^v//")" >> $GITHUB_ENV - - name: Set up JDK 21 + + - name: Set up JDK 11 uses: actions/setup-java@v4 with: java-version: '11' - distribution: 'adopt' - - name: Gradle Wrapper Validation - uses: gradle/wrapper-validation-action@v2 + distribution: 'temurin' + cache: 'gradle' - - name: Gradle Build Action - uses: gradle/gradle-build-action@v2 - with: - arguments: | - publish -Pversion=${{ env.RELEASE_VERSION }} + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + + - name: Publish with Gradle + run: ./gradlew publish -Pversion=${{ env.RELEASE_VERSION }} env: REPOSILITE_USERNAME: ${{ secrets.REPOSILITE_USERNAME }} REPOSILITE_PASSWORD: ${{ secrets.REPOSILITE_PASSWORD }} \ No newline at end of file From 124a77597f42e16156acf86602e06592c6bb6114 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 17 Sep 2025 10:02:02 +0200 Subject: [PATCH 7/9] Moved to no.novari.fint --- .../java/no/novari/{ => fint}/model/FintAbstractObject.java | 2 +- .../no/novari/{ => fint}/model/FintComplexDatatypeObject.java | 2 +- src/main/java/no/novari/{ => fint}/model/FintIdentifikator.java | 2 +- src/main/java/no/novari/{ => fint}/model/FintMainObject.java | 2 +- src/main/java/no/novari/{ => fint}/model/FintModelObject.java | 2 +- src/main/java/no/novari/{ => fint}/model/FintMultiplicity.java | 2 +- src/main/java/no/novari/{ => fint}/model/FintObject.java | 2 +- src/main/java/no/novari/{ => fint}/model/FintReference.java | 2 +- src/main/java/no/novari/{ => fint}/model/FintRelation.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename src/main/java/no/novari/{ => fint}/model/FintAbstractObject.java (63%) rename src/main/java/no/novari/{ => fint}/model/FintComplexDatatypeObject.java (66%) rename src/main/java/no/novari/{ => fint}/model/FintIdentifikator.java (97%) rename src/main/java/no/novari/{ => fint}/model/FintMainObject.java (97%) rename src/main/java/no/novari/{ => fint}/model/FintModelObject.java (85%) rename src/main/java/no/novari/{ => fint}/model/FintMultiplicity.java (98%) rename src/main/java/no/novari/{ => fint}/model/FintObject.java (93%) rename src/main/java/no/novari/{ => fint}/model/FintReference.java (63%) rename src/main/java/no/novari/{ => fint}/model/FintRelation.java (98%) diff --git a/src/main/java/no/novari/model/FintAbstractObject.java b/src/main/java/no/novari/fint/model/FintAbstractObject.java similarity index 63% rename from src/main/java/no/novari/model/FintAbstractObject.java rename to src/main/java/no/novari/fint/model/FintAbstractObject.java index 5cac851..b4df209 100644 --- a/src/main/java/no/novari/model/FintAbstractObject.java +++ b/src/main/java/no/novari/fint/model/FintAbstractObject.java @@ -1,4 +1,4 @@ -package no.novari.model; +package no.novari.fint.model; public interface FintAbstractObject extends FintObject { } diff --git a/src/main/java/no/novari/model/FintComplexDatatypeObject.java b/src/main/java/no/novari/fint/model/FintComplexDatatypeObject.java similarity index 66% rename from src/main/java/no/novari/model/FintComplexDatatypeObject.java rename to src/main/java/no/novari/fint/model/FintComplexDatatypeObject.java index 381982d..497905f 100644 --- a/src/main/java/no/novari/model/FintComplexDatatypeObject.java +++ b/src/main/java/no/novari/fint/model/FintComplexDatatypeObject.java @@ -1,4 +1,4 @@ -package no.novari.model; +package no.novari.fint.model; public interface FintComplexDatatypeObject extends FintObject { } diff --git a/src/main/java/no/novari/model/FintIdentifikator.java b/src/main/java/no/novari/fint/model/FintIdentifikator.java similarity index 97% rename from src/main/java/no/novari/model/FintIdentifikator.java rename to src/main/java/no/novari/fint/model/FintIdentifikator.java index 849c68e..54a809c 100644 --- a/src/main/java/no/novari/model/FintIdentifikator.java +++ b/src/main/java/no/novari/fint/model/FintIdentifikator.java @@ -1,4 +1,4 @@ -package no.novari.model; +package no.novari.fint.model; /** * Represents an identifikator within the Fint model. diff --git a/src/main/java/no/novari/model/FintMainObject.java b/src/main/java/no/novari/fint/model/FintMainObject.java similarity index 97% rename from src/main/java/no/novari/model/FintMainObject.java rename to src/main/java/no/novari/fint/model/FintMainObject.java index aab6795..967ffe5 100644 --- a/src/main/java/no/novari/model/FintMainObject.java +++ b/src/main/java/no/novari/fint/model/FintMainObject.java @@ -1,4 +1,4 @@ -package no.novari.model; +package no.novari.fint.model; import java.util.Map; diff --git a/src/main/java/no/novari/model/FintModelObject.java b/src/main/java/no/novari/fint/model/FintModelObject.java similarity index 85% rename from src/main/java/no/novari/model/FintModelObject.java rename to src/main/java/no/novari/fint/model/FintModelObject.java index b07477e..b0fcfa5 100644 --- a/src/main/java/no/novari/model/FintModelObject.java +++ b/src/main/java/no/novari/fint/model/FintModelObject.java @@ -1,4 +1,4 @@ -package no.novari.model; +package no.novari.fint.model; public interface FintModelObject extends FintMainObject { diff --git a/src/main/java/no/novari/model/FintMultiplicity.java b/src/main/java/no/novari/fint/model/FintMultiplicity.java similarity index 98% rename from src/main/java/no/novari/model/FintMultiplicity.java rename to src/main/java/no/novari/fint/model/FintMultiplicity.java index 08e8be6..d6fcbf3 100644 --- a/src/main/java/no/novari/model/FintMultiplicity.java +++ b/src/main/java/no/novari/fint/model/FintMultiplicity.java @@ -1,4 +1,4 @@ -package no.novari.model; +package no.novari.fint.model; /** * Enumerates the possible multiplicities of relationships in the Fint model. diff --git a/src/main/java/no/novari/model/FintObject.java b/src/main/java/no/novari/fint/model/FintObject.java similarity index 93% rename from src/main/java/no/novari/model/FintObject.java rename to src/main/java/no/novari/fint/model/FintObject.java index 97f3072..80fb06a 100644 --- a/src/main/java/no/novari/model/FintObject.java +++ b/src/main/java/no/novari/fint/model/FintObject.java @@ -1,4 +1,4 @@ -package no.novari.model; +package no.novari.fint.model; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/no/novari/model/FintReference.java b/src/main/java/no/novari/fint/model/FintReference.java similarity index 63% rename from src/main/java/no/novari/model/FintReference.java rename to src/main/java/no/novari/fint/model/FintReference.java index 8276558..d2552de 100644 --- a/src/main/java/no/novari/model/FintReference.java +++ b/src/main/java/no/novari/fint/model/FintReference.java @@ -1,4 +1,4 @@ -package no.novari.model; +package no.novari.fint.model; public interface FintReference extends FintObject { diff --git a/src/main/java/no/novari/model/FintRelation.java b/src/main/java/no/novari/fint/model/FintRelation.java similarity index 98% rename from src/main/java/no/novari/model/FintRelation.java rename to src/main/java/no/novari/fint/model/FintRelation.java index 6ffd320..d512593 100644 --- a/src/main/java/no/novari/model/FintRelation.java +++ b/src/main/java/no/novari/fint/model/FintRelation.java @@ -1,4 +1,4 @@ -package no.novari.model; +package no.novari.fint.model; /** * Represents a relation between Fint model objects. From 5b0023d2d0557faa0d98b779586dc45bd5af39fb Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 17 Sep 2025 10:02:20 +0200 Subject: [PATCH 8/9] Updated Github action tasks --- .github/workflows/build.yaml | 4 ++-- .github/workflows/publish.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3c0c6e8..d980eb3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,10 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'adopt' java-version: 11 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 2185c4e..4be09f2 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -9,20 +9,20 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set version run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF#refs/*/} | sed "s/^v//")" >> $GITHUB_ENV - name: Set up JDK 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: '11' distribution: 'temurin' cache: 'gradle' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Publish with Gradle run: ./gradlew publish -Pversion=${{ env.RELEASE_VERSION }} From c8b1cd97c103b8cbc0c7ccafa7c781b5294816f6 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord <26850+oleanders@users.noreply.github.com> Date: Wed, 17 Sep 2025 10:03:39 +0200 Subject: [PATCH 9/9] Compatible with Java 8 --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8a11a08..f52decb 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,8 @@ java { toolchain { languageVersion = JavaLanguageVersion.of(11) } + sourceCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_1_8 } repositories { @@ -23,7 +25,7 @@ repositories { dependencies { implementation 'javax.validation:validation-api:2.0.1.Final' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.19.0' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.20.0' } javadoc {