Skip to content

Commit 46008ef

Browse files
konfigurerte ikke manifestet på riktig sted 🫠
1 parent c0dcd2b commit 46008ef

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

build.gradle.kts

+8-6
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ dependencies {
3434

3535
java {
3636
withSourcesJar()
37-
manifest {
38-
attributes(mapOf(
39-
"Implementation-Title" to project.name,
40-
"Implementation-Version" to project.version
41-
))
42-
}
4337
}
4438

4539
kotlin {
@@ -49,6 +43,14 @@ kotlin {
4943
}
5044

5145
tasks {
46+
jar {
47+
manifest {
48+
attributes(mapOf(
49+
"Implementation-Title" to project.name,
50+
"Implementation-Version" to project.version
51+
))
52+
}
53+
}
5254
withType<Test> {
5355
useJUnitPlatform()
5456
testLogging {

src/main/kotlin/no/nav/helse/rapids_rivers/RapidApplication.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,11 @@ class RapidApplication internal constructor(
281281

282282
with(meterRegistry) {
283283
val pkg = RapidApplication.javaClass.`package`
284-
val vendor = pkg?.implementationVendor ?: "unknown"
284+
val title = pkg?.implementationTitle ?: "unknown"
285285
val version = pkg?.implementationVersion ?: "unknown"
286286
MultiGauge.builder("rapids.and.rivers.info")
287287
.description("Rapids and rivers version info")
288-
.tag("vendor", vendor)
288+
.tag("title", title)
289289
.tag("version", version)
290290
.register(this)
291291
.register(listOf(MultiGauge.Row.of(Tags.of(emptyList()), 1)))

0 commit comments

Comments
 (0)