Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
37427f4
Removed deprecated field: format
oleanders May 19, 2025
61219ad
Removed deprecated: foreldreansvar og relation person
oleanders May 19, 2025
7738acd
rename basisgruppe -> klasse + deprecated fields
oleanders May 19, 2025
a7ed3fb
Upgraded Gradle + no.fint -> no.novari
oleanders Jun 2, 2025
1ad9f21
Build with Java 11, compatible with Java 8
oleanders Sep 16, 2025
dabf8b3
Reorganize into no.novari.fint
oleanders Sep 17, 2025
ecd3470
Upgraded github action tasks
oleanders Sep 17, 2025
82de0a1
Updated github action to Java 11
oleanders Sep 17, 2025
bfc9cad
Downgraded Gradle
oleanders Sep 17, 2025
a3292b8
Updated gradle build
oleanders Sep 17, 2025
2a8b2e8
Upgraded model-resource og model-core with new package structure
oleanders Sep 17, 2025
a687c84
Updated test: Basisgruppe -> Klasse
oleanders Sep 17, 2025
7c108d2
Move tests to dedicated subprojects and upgraded dependencies
oleanders Sep 18, 2025
5adff19
Lets try with Java 21
oleanders Sep 18, 2025
feedeb8
Upgraded Gradle
oleanders Sep 18, 2025
1dd96b8
Upgrade Spring Boot
oleanders Sep 18, 2025
d28001d
Not necessary when using option.release
oleanders Dec 10, 2025
dde3f65
Upgraded some dependencies
oleanders Dec 10, 2025
422e1d4
Adjustment on maven publish
oleanders Dec 10, 2025
6b7233d
Upgrade to gradle 9
oleanders Jan 9, 2026
7edd860
Upgrade dependencies
oleanders Jan 13, 2026
679ea1d
Upgrade fint-model-* with support for inverseName
oleanders Jan 13, 2026
8e6bc63
Merge branch 'master' into prepare-for-v4
oleanders Jan 13, 2026
57eac61
Move datautstyr to correct location
oleanders Jan 13, 2026
76a820b
Update fint.model-core
oleanders Jan 13, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5

- name: Setup Java 8
uses: actions/setup-java@v3
- name: Setup Java 21
uses: actions/setup-java@v5
with:
distribution: adopt
java-version: 8
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Gradle Build
uses: gradle/gradle-build-action@v2
with:
gradle-version: 4.10.3
arguments: clean build
run: ./gradlew clean build
22 changes: 11 additions & 11 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v5

- name: Set version
run: |
echo "RELEASE_VERSION=${TAG_NAME:1}" >> $GITHUB_ENV
env:
TAG_NAME: ${{github.event.release.tag_name}}

- name: Setup Java 8
uses: actions/setup-java@v3
- name: Setup Java 21
uses: actions/setup-java@v5
with:
distribution: adopt
java-version: 8
java-version: 21

- name: Gradle Build
uses: gradle/gradle-build-action@v2
with:
gradle-version: 4.10.3
arguments: clean build publish -Pversion=${{env.RELEASE_VERSION}}
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Publish Build
run: ./gradlew clean build publish -Pversion=${{ env.RELEASE_VERSION }}
env:
REPOSILITE_USERNAME: ${{secrets.REPOSILITE_USERNAME}}
REPOSILITE_PASSWORD: ${{secrets.REPOSILITE_PASSWORD}}
REPOSILITE_USERNAME: ${{ secrets.REPOSILITE_USERNAME }}
REPOSILITE_PASSWORD: ${{ secrets.REPOSILITE_PASSWORD }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ bin/
*.ipr
*.iml
.vscode/
.java-version
.DS_Store
61 changes: 38 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
plugins {
id 'com.github.ben-manes.versions' version '0.27.0'
id 'com.github.ben-manes.versions' version '0.53.0'
}

apply plugin: 'java-library'
apply plugin: 'maven-publish'

allprojects {
sourceCompatibility = 1.8
targetCompatibility = 1.8
java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
withSourcesJar()
}

project.group = 'no.fint'
tasks.withType(JavaCompile).configureEach {
options.release = 8
options.compilerArgs += ['-Xlint:-options']
}

project.group = 'no.novari'

repositories {
maven { url 'https://repo.fintlabs.no/releases' }
maven { url = 'https://repo.fintlabs.no/releases' }
mavenLocal()
mavenCentral()
}
Expand All @@ -21,13 +30,18 @@ allprojects {
subprojects {
apply plugin: 'java-library'
apply plugin: 'groovy'
apply plugin: 'maven-publish'
apply from: 'https://raw.githubusercontent.com/FINTLabs/fint-buildscripts/v1.8.0/dependencies.gradle'

configurations {
annotationProcessor
}

dependencies {
annotationProcessor("org.projectlombok:lombok:${lombokVersion}")
compileOnly("org.projectlombok:lombok:${lombokVersion}")
implementation("com.fasterxml.jackson.core:jackson-annotations:2.13.3")
implementation("com.fasterxml.jackson.core:jackson-core:2.13.3")
implementation("com.fasterxml.jackson.core:jackson-annotations:2.20")
implementation("com.fasterxml.jackson.core:jackson-core:2.20.1")
implementation("javax.validation:validation-api:2.0.1.Final")
testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.2")
}

test {
Expand All @@ -36,22 +50,23 @@ subprojects {
}
}

publishing {
repositories {
maven {
url "https://repo.fintlabs.no/releases"
credentials {
username = System.getenv("REPOSILITE_USERNAME")
password = System.getenv("REPOSILITE_PASSWORD")
}
authentication {
basic(BasicAuthentication)
if (!project.name.endsWith('-tests')) {
apply plugin: 'maven-publish'

publishing {
repositories {
maven {
url = "https://repo.fintlabs.no/releases"
credentials {
username = System.getenv("REPOSILITE_USERNAME")
password = System.getenv("REPOSILITE_PASSWORD")
}
}
}
}
publications {
maven(MavenPublication) {
from(components.java)
publications {
create('maven', MavenPublication) {
from components.java
}
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions fint-administrasjon-model-java/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
compile project(":fint-felles-model-java")
}
dependencies {
api project(":fint-felles-model-java")
}

This file was deleted.

This file was deleted.

Loading
Loading