Fjerner kotlin-folder fra filstruktur og legger til warn på sourcesJa…

…r hvis ikke feiler det av noen grunn
navikt · Aug 28, 2023 · 12098b9 · 12098b9
1 parent c0afce3
commit 12098b9
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 3 deletions.
diff --git a/http-client/build.gradle.kts b/http-client/build.gradle.kts
@@ -20,3 +20,7 @@ dependencies {
 
     testImplementation("com.github.tomakehurst:wiremock-jre8-standalone:$wiremockVersion")
 }
+
+tasks.sourcesJar {
+    duplicatesStrategy = DuplicatesStrategy.WARN
+}
diff --git a/http-client/main/no/nav/tilleggsstonader/libs/http/client/RetryOAuth2HttpClient.kt b/http-client/main/no/nav/tilleggsstonader/libs/http/client/RetryOAuth2HttpClient.kt
@@ -26,15 +26,15 @@ class RetryOAuth2HttpClient(
         HttpServerErrorException.BadGateway::class,
     )
 
-    override fun post(oAuth2HttpRequest: OAuth2HttpRequest): OAuth2AccessTokenResponse? {
+    override fun post(req: OAuth2HttpRequest): OAuth2AccessTokenResponse? {
         var retries = 0
 
         while (true) {
             try {
-                val response = super.post(oAuth2HttpRequest)
+                val response = super.post(req)
                 return response
             } catch (e: Exception) {
-                handleException(e, retries++, oAuth2HttpRequest)
+                handleException(e, retries++, req)
             }
         }
     }

diff --git a/log/build.gradle.kts b/log/build.gradle.kts
@@ -8,3 +8,7 @@ dependencies {
     implementation("org.slf4j:slf4j-api")
     implementation("jakarta.servlet:jakarta.servlet-api")
 }
+
+tasks.sourcesJar {
+    duplicatesStrategy = DuplicatesStrategy.WARN
+}
diff --git a/.../nav/tilleggsstonader/libs/log/IdUtils.kt → .../nav/tilleggsstonader/libs/log/IdUtils.kt b/.../nav/tilleggsstonader/libs/log/IdUtils.kt → .../nav/tilleggsstonader/libs/log/IdUtils.kt
diff --git a/...lleggsstonader/libs/log/NavHttpHeaders.kt → ...lleggsstonader/libs/log/NavHttpHeaders.kt b/...lleggsstonader/libs/log/NavHttpHeaders.kt → ...lleggsstonader/libs/log/NavHttpHeaders.kt
diff --git a/...eggsstonader/libs/log/filter/LogFilter.kt → ...eggsstonader/libs/log/filter/LogFilter.kt b/...eggsstonader/libs/log/filter/LogFilter.kt → ...eggsstonader/libs/log/filter/LogFilter.kt
diff --git a/...libs/log/filter/LogFilterConfiguration.kt → ...libs/log/filter/LogFilterConfiguration.kt b/...libs/log/filter/LogFilterConfiguration.kt → ...libs/log/filter/LogFilterConfiguration.kt
diff --git a/...ader/libs/log/filter/RequestTimeFilter.kt → ...ader/libs/log/filter/RequestTimeFilter.kt b/...ader/libs/log/filter/RequestTimeFilter.kt → ...ader/libs/log/filter/RequestTimeFilter.kt
diff --git a/...eggsstonader/libs/log/mdc/MDCConstants.kt → ...eggsstonader/libs/log/mdc/MDCConstants.kt b/...eggsstonader/libs/log/mdc/MDCConstants.kt → ...eggsstonader/libs/log/mdc/MDCConstants.kt
diff --git a/...stonader/libs/log/filter/LogFilterTest.kt → ...stonader/libs/log/filter/LogFilterTest.kt b/...stonader/libs/log/filter/LogFilterTest.kt → ...stonader/libs/log/filter/LogFilterTest.kt