-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Flytte inntekt kontrakter fra dagpenger-events til inntekt APIet. (#163)
- Loading branch information
Showing
25 changed files
with
805 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,8 @@ on: | |
| push: | ||
| branches-ignore: | ||
| - 'dependabot/**' | ||
| paths-ignore: | ||
| - 'dp-inntekt-kontrakter/**' | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| name: Publish dp-inntekt-kontrakter | ||
|
|
||
| on: | ||
| push: | ||
| paths: | ||
| - 'dp-inntekt-kontrakter/**' | ||
| jobs: | ||
|
|
||
| build: | ||
| name: Build | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
| - name: Set up Java and build | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 17 | ||
| - uses: gradle/[email protected] | ||
| - uses: gradle/[email protected] | ||
| env: | ||
| # Eksluder test dependencies | ||
| DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS: compileClasspath|runtimeClasspath | ||
| with: | ||
| gradle-version: wrapper | ||
| dependency-graph: generate-and-submit | ||
| arguments: --configuration-cache test | ||
|
|
||
|
|
||
| release: | ||
| name: Create Release | ||
| needs: build | ||
| runs-on: ubuntu-latest | ||
| if: github.ref == 'refs/heads/master' && !contains(github.event.head_commit.message, 'ci skip') | ||
| permissions: | ||
| contents: write | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Set release tag | ||
| run: | | ||
| export TAG_NAME="1_$(TZ="Europe/Oslo" date +%Y%m%d).$(echo $GITHUB_SHA | cut -c 1-6)" | ||
| echo "RELEASE_TAG=$TAG_NAME" >> $GITHUB_ENV | ||
| - uses: ncipollo/release-action@6c75be85e571768fa31b40abf38de58ba0397db5 # ratchet:ncipollo/release-action@v1 | ||
| with: | ||
| tag: ${{ env.RELEASE_TAG }} | ||
| generateReleaseNotes: true | ||
| outputs: | ||
| tag: ${{ env.RELEASE_TAG }} | ||
| publish: | ||
| runs-on: ubuntu-latest | ||
| needs: release | ||
| permissions: | ||
| packages: write | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 17.x | ||
| cache: 'gradle' | ||
| - name: publish | ||
| run: ./gradlew -Pversion="$(echo ${{ needs.release.outputs.tag }})" publish | ||
| env: | ||
| ORG_GRADLE_PROJECT_githubUser: x-access-token | ||
| ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/db/InntektStore.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/klassifiserer/KlassifisertInntekt.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...ntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/klassifiserer/KlassifisertPostering.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 7 additions & 7 deletions
14
dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/mapping/MapToSpesifisertInntekt.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/mapping/PosteringsTypeMapping.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 8 additions & 8 deletions
16
...nntekt-api/src/test/kotlin/no/nav/dagpenger/inntekt/klassifiser/KlassifiserInntektTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...tekt-api/src/test/kotlin/no/nav/dagpenger/inntekt/klassifiser/KlassifiserPosteringTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
dp-inntekt-api/src/test/kotlin/no/nav/dagpenger/inntekt/mapping/PosteringsTypeMappingTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| plugins { | ||
| id("common") | ||
| `java-library` | ||
| id("maven-publish") | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation("de.huxhorn.sulky:de.huxhorn.sulky.ulid:8.3.0") | ||
| } | ||
|
|
||
| val sourcesJar by tasks.registering(Jar::class) { | ||
| archiveClassifier.set("sources") | ||
| from(sourceSets["main"].allSource) | ||
| } | ||
|
|
||
| val githubUser: String? by project | ||
| val githubPassword: String? by project | ||
|
|
||
| publishing { | ||
|
|
||
| repositories { | ||
| maven { | ||
| url = uri("https://maven.pkg.github.com/navikt/dp-inntekt-kontrakter") | ||
| credentials { | ||
| username = githubUser | ||
| password = githubPassword | ||
| } | ||
| } | ||
| } | ||
| publications { | ||
| create<MavenPublication>("mavenJava") { | ||
| from(components["java"]) | ||
| artifact(sourcesJar.get()) | ||
|
|
||
| pom { | ||
| name.set("dp-inntekt-kontrakter") | ||
| description.set( | ||
| "Holder definisjonen av dagpenger inntekt", | ||
| ) | ||
| url.set("https://github.com/navikt/dp-inntekt") | ||
| withXml { | ||
| asNode().appendNode("packaging", "jar") | ||
| } | ||
| licenses { | ||
| license { | ||
| name.set("MIT License") | ||
| name.set("https://opensource.org/licenses/MIT") | ||
| } | ||
| } | ||
| developers { | ||
| developer { | ||
| organization.set("NAV (Arbeids- og velferdsdirektoratet) - The Norwegian Labour and Welfare Administration") | ||
| organizationUrl.set("https://www.nav.no") | ||
| } | ||
| } | ||
|
|
||
| scm { | ||
| connection.set("scm:git:git://github.com/navikt/dp-inntekt.git") | ||
| developerConnection.set("scm:git:git://github.com/navikt/dp-inntekt.git") | ||
| url.set("https://github.com/navikt/dp-inntekt") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.