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..d980eb3 --- /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@v5 + + - name: Setup Java + uses: actions/setup-java@v5 + with: + distribution: 'adopt' + java-version: 11 + + - 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 432c396..4be09f2 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -9,23 +9,23 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 + - 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 - with: - java-version: '8' - distribution: 'adopt' - - name: Gradle Wrapper Validation - uses: gradle/wrapper-validation-action@v1.0.4 - - name: Gradle Build Action - uses: gradle/gradle-build-action@v2.1.3 + - name: Set up JDK 11 + uses: actions/setup-java@v5 with: - arguments: | - publish - -Pversion=${{ env.RELEASE_VERSION }} + java-version: '11' + distribution: 'temurin' + cache: 'gradle' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - 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 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..f52decb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,19 @@ 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' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +project.group = 'no.novari' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } + sourceCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenLocal() @@ -18,7 +25,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.20.0' } javadoc { @@ -28,4 +35,22 @@ javadoc { destinationDir = file('./javadocs/') } -apply from: 'https://raw.githubusercontent.com/FINTLabs/fint-buildscripts/master/reposilite.ga.gradle' +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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d047364..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-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.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/fint/model/FintAbstractObject.java similarity index 63% rename from src/main/java/no/fint/model/FintAbstractObject.java rename to src/main/java/no/novari/fint/model/FintAbstractObject.java index f93bdd7..b4df209 100644 --- a/src/main/java/no/fint/model/FintAbstractObject.java +++ b/src/main/java/no/novari/fint/model/FintAbstractObject.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.fint.model; public interface FintAbstractObject extends FintObject { } diff --git a/src/main/java/no/fint/model/FintComplexDatatypeObject.java b/src/main/java/no/novari/fint/model/FintComplexDatatypeObject.java similarity index 66% rename from src/main/java/no/fint/model/FintComplexDatatypeObject.java rename to src/main/java/no/novari/fint/model/FintComplexDatatypeObject.java index c62dd68..497905f 100644 --- a/src/main/java/no/fint/model/FintComplexDatatypeObject.java +++ b/src/main/java/no/novari/fint/model/FintComplexDatatypeObject.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.fint.model; public interface FintComplexDatatypeObject extends FintObject { } diff --git a/src/main/java/no/fint/model/FintIdentifikator.java b/src/main/java/no/novari/fint/model/FintIdentifikator.java similarity index 97% rename from src/main/java/no/fint/model/FintIdentifikator.java rename to src/main/java/no/novari/fint/model/FintIdentifikator.java index b396eb5..54a809c 100644 --- a/src/main/java/no/fint/model/FintIdentifikator.java +++ b/src/main/java/no/novari/fint/model/FintIdentifikator.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.fint.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/fint/model/FintMainObject.java similarity index 94% rename from src/main/java/no/fint/model/FintMainObject.java rename to src/main/java/no/novari/fint/model/FintMainObject.java index 4a32f8e..967ffe5 100644 --- a/src/main/java/no/fint/model/FintMainObject.java +++ b/src/main/java/no/novari/fint/model/FintMainObject.java @@ -1,7 +1,5 @@ -package no.fint.model; +package no.novari.fint.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/fint/model/FintModelObject.java similarity index 85% rename from src/main/java/no/fint/model/FintModelObject.java rename to src/main/java/no/novari/fint/model/FintModelObject.java index 1d8dac9..b0fcfa5 100644 --- a/src/main/java/no/fint/model/FintModelObject.java +++ b/src/main/java/no/novari/fint/model/FintModelObject.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.fint.model; public interface FintModelObject extends FintMainObject { diff --git a/src/main/java/no/fint/model/FintMultiplicity.java b/src/main/java/no/novari/fint/model/FintMultiplicity.java similarity index 98% rename from src/main/java/no/fint/model/FintMultiplicity.java rename to src/main/java/no/novari/fint/model/FintMultiplicity.java index 80c76a7..d6fcbf3 100644 --- a/src/main/java/no/fint/model/FintMultiplicity.java +++ b/src/main/java/no/novari/fint/model/FintMultiplicity.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.fint.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/fint/model/FintObject.java similarity index 93% rename from src/main/java/no/fint/model/FintObject.java rename to src/main/java/no/novari/fint/model/FintObject.java index 3898243..80fb06a 100644 --- a/src/main/java/no/fint/model/FintObject.java +++ b/src/main/java/no/novari/fint/model/FintObject.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.fint.model; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/no/fint/model/FintReference.java b/src/main/java/no/novari/fint/model/FintReference.java similarity index 63% rename from src/main/java/no/fint/model/FintReference.java rename to src/main/java/no/novari/fint/model/FintReference.java index a552e69..d2552de 100644 --- a/src/main/java/no/fint/model/FintReference.java +++ b/src/main/java/no/novari/fint/model/FintReference.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.fint.model; public interface FintReference extends FintObject { diff --git a/src/main/java/no/fint/model/FintRelation.java b/src/main/java/no/novari/fint/model/FintRelation.java similarity index 98% rename from src/main/java/no/fint/model/FintRelation.java rename to src/main/java/no/novari/fint/model/FintRelation.java index 4095bb0..d512593 100644 --- a/src/main/java/no/fint/model/FintRelation.java +++ b/src/main/java/no/novari/fint/model/FintRelation.java @@ -1,4 +1,4 @@ -package no.fint.model; +package no.novari.fint.model; /** * Represents a relation between Fint model objects.