Skrevet om skattekort-service til å benytte convention plugins.

navikt · Jul 10, 2024 · 139210e · 139210e
1 parent 8e1880f
commit 139210e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 57 deletions.
diff --git a/.github/workflows/app.skattekort-service.yml b/.github/workflows/app.skattekort-service.yml
@@ -3,6 +3,7 @@ name: skattekort-service
 on:
   push:
     paths:
+      - "plugins/**"
       - libs/reactive-core
       - libs/reactive-security
       - libs/security-core

diff --git a/apps/skattekort-service/build.gradle b/apps/skattekort-service/build.gradle
@@ -1,44 +1,13 @@
 plugins {
+    id "dolly-apps"
 
-    id 'java'
-    id "org.sonarqube" version "4.4.1.3373"
-    id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.4"
-    id "jacoco"
     id 'org.unbroken-dome.xjc' version '2.0.0'
 }
 
 sonarqube {
     properties {
-        property "sonar.dynamicAnalysis", "reuseReports"
-        property "sonar.host.url", "https://sonarcloud.io"
-        property "sonar.java.coveragePlugin", "jacoco"
-        property "sonar.language", "java"
-        property "sonar.token", System.getenv("SONAR_TOKEN")
-        property "sonar.organization", "navikt"
-        property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-skattekort-service"
         property "sonar.projectName", "testnav-skattekort-service"
-        property "sonar.sourceEncoding", "UTF-8"
-    }
-}
-
-bootJar {
-    archiveFileName = "app.jar"
-    mainClass = 'no.nav.skattekortservice.SkattekortServiceApplicationStarter'
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-dependencyManagement {
-    applyMavenExclusions = false
-    imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
-    }
-}
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
@@ -53,18 +22,6 @@ xjc {
     srcDirName = 'resources/schema'
 }
 
-repositories {
-    mavenCentral()
-    maven {
-        name = "GitHubPackages"
-        url = uri('https://maven.pkg.github.com/navikt/maven-release')
-        credentials(PasswordCredentials) {
-            password System.getenv("NAV_TOKEN")
-            username 'token'
-        }
-    }
-}
-
 dependencies {
     implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
     implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
@@ -75,26 +32,13 @@ dependencies {
     implementation 'no.nav.testnav.libs:reactive-security'
     implementation 'no.nav.testnav.libs:data-transfer-objects'
 
-    implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
-    implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
-    implementation 'org.springframework.boot:spring-boot-starter-actuator'
-
-    implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'org.hibernate.validator:hibernate-validator'
 
     implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
-    implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback"
-
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
     implementation "ma.glasnost.orika:orika-core:$versions.orika"
-    annotationProcessor 'org.projectlombok:lombok'
-    implementation 'org.projectlombok:lombok'
-
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
diff --git a/apps/skattekort-service/settings.gradle b/apps/skattekort-service/settings.gradle
@@ -4,6 +4,8 @@ plugins {
 
 rootProject.name = 'skattekort-service'
 
+includeBuild "../../plugins/java"
+
 includeBuild '../../libs/security-core'
 includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/reactive-security'