Skip to content

Commit

Permalink
Bruker nå convention plugin dolly-apps. (#3616)
Browse files Browse the repository at this point in the history
  • Loading branch information
rfc3092 authored Sep 16, 2024
1 parent 45b5696 commit 5e39264
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 138 deletions.
87 changes: 17 additions & 70 deletions apps/levende-arbeidsforhold-scheduler/build.gradle
Original file line number Diff line number Diff line change
@@ -1,87 +1,34 @@
plugins {
id 'java'
id "org.sonarqube" version "5.0.0.4638"
id 'org.springframework.boot' version "3.2.6"
id 'io.spring.dependency-management' version "1.1.5"
id "jacoco"
}

test {
useJUnitPlatform()
id "dolly-apps"
}

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-levende-arbeidsforhold-scheduler"
property "sonar.projectName", "testnav-levende-arbeidsforhold-scheduler"
property "sonar.sourceEncoding", "UTF-8"
}
}
bootJar {
archiveFileName = "app.jar"
}

dependencyManagement {
applyMavenExclusions = false
imports {
mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1'
}
}

repositories {
mavenCentral()
mavenLocal()
maven {
url = uri('https://packages.confluent.io/maven/')
}
}

dependencies {
implementation 'no.nav.testnav.libs:security-core'
implementation 'no.nav.testnav.libs:servlet-core'
implementation 'no.nav.testnav.libs:data-transfer-objects'
implementation 'no.nav.testnav.libs:servlet-security'
implementation 'no.nav.testnav.libs:servlet-insecure-security'


implementation 'org.springframework.boot:spring-boot-starter-webflux'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-quartz'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
implementation 'org.springframework.boot:spring-boot-starter-security'

implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation "no.nav.testnav.libs:security-core"
implementation "no.nav.testnav.libs:servlet-core"
implementation "no.nav.testnav.libs:data-transfer-objects"
implementation "no.nav.testnav.libs:servlet-security"
implementation "no.nav.testnav.libs:servlet-insecure-security"

implementation 'io.micrometer:micrometer-registry-prometheus'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "org.springframework.boot:spring-boot-starter-quartz"
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
implementation "org.springframework.boot:spring-boot-starter-security"

implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
implementation 'org.hibernate.validator:hibernate-validator'
implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"

testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'

implementation 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
testAnnotationProcessor 'org.projectlombok:lombok'
testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"

//Dependencies av dependencies som må ha spesifisert versjon for å ikke forårsake sikkerthets-sårbarheter
implementation 'org.apache.tomcat.embed:tomcat-embed-core:10.1.25'
implementation 'org.bouncycastle:bcprov-jdk18on:1.78'
implementation 'com.nimbusds:nimbus-jose-jwt:9.37.2'
implementation "org.apache.tomcat.embed:tomcat-embed-core:10.1.25"
implementation "org.bouncycastle:bcprov-jdk18on:$versions.bouncyCastle"
implementation "com.nimbusds:nimbus-jose-jwt:9.37.2"

}
java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}
}
85 changes: 17 additions & 68 deletions apps/levende-arbeidsforhold-service/build.gradle
Original file line number Diff line number Diff line change
@@ -1,85 +1,34 @@
plugins {
id 'java'
id "org.sonarqube" version "5.0.0.4638"
id 'org.springframework.boot' version "3.2.6"
id 'io.spring.dependency-management' version "1.1.5"
id "jacoco"
}

test {
useJUnitPlatform()
id "dolly-apps"
}

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-levende-arbeidsforhold-service"
property "sonar.projectName", "testnav-levende-arbeidsforhold-service"
property "sonar.sourceEncoding", "UTF-8"
}
}
bootJar {
archiveFileName = "app.jar"
}

dependencyManagement {
applyMavenExclusions = false
imports {
mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1'
}
}

repositories {
mavenCentral()
mavenLocal()
maven {
url = uri('https://packages.confluent.io/maven/')
}
}

dependencies {
implementation 'no.nav.testnav.libs:avro-schema'
implementation 'no.nav.testnav.libs:kafka-config'
implementation 'no.nav.testnav.libs:security-core'
implementation 'no.nav.testnav.libs:servlet-insecure-security'
implementation 'no.nav.testnav.libs:servlet-core'
implementation 'no.nav.testnav.libs:reactive-core'
implementation 'no.nav.testnav.libs:data-transfer-objects'

implementation 'org.springframework.boot:spring-boot-starter-webflux'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation "io.confluent:kafka-avro-serializer:$versions.avro"
implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"

implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation "no.nav.testnav.libs:avro-schema"
implementation "no.nav.testnav.libs:data-transfer-objects"
implementation "no.nav.testnav.libs:kafka-config"
implementation "no.nav.testnav.libs:reactive-core"
implementation "no.nav.testnav.libs:security-core"
implementation "no.nav.testnav.libs:servlet-core"
implementation "no.nav.testnav.libs:servlet-insecure-security"

implementation 'io.micrometer:micrometer-registry-prometheus'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka"
implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"

implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
implementation 'org.hibernate.validator:hibernate-validator'
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
implementation "org.springframework.boot:spring-boot-starter-security"
implementation "org.springframework.boot:spring-boot-starter-web"

testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
implementation "org.springframework.kafka:spring-kafka"

implementation 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
testAnnotationProcessor 'org.projectlombok:lombok'

implementation 'org.apache.kafka:kafka-clients:3.7.0'
implementation 'io.confluent:kafka-avro-serializer:7.6.0'
implementation 'org.springframework.kafka:spring-kafka'
}
java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
}

0 comments on commit 5e39264

Please sign in to comment.