fix bad merge again

SylvainJuge · SylvainJuge · commit 7df9862348e2 · 2024-09-17T11:11:50.000+02:00
diff --git a/jmx-scraper/build.gradle.kts b/jmx-scraper/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 description = "JMX metrics scraper"
 otelJava.moduleName.set("io.opentelemetry.contrib.jmxscraper")
 
-application.mainClass.set("io.opentelemetry.contrib.jmxscraper.JmxMetrics")
+application.mainClass.set("io.opentelemetry.contrib.jmxscraper.JmxScraper")
 
 dependencies {
   implementation("io.opentelemetry:opentelemetry-api")
@@ -69,7 +69,7 @@ tasks.register<Jar>("appJar") {
   from(sourceSets.get("integrationTest").output)
   archiveClassifier.set("app")
   manifest {
-    attributes["Main-Class"] = "io.opentelemetry.contrib.jmxscraper.JmxScraper"
+    attributes["Main-Class"] = "io.opentelemetry.contrib.jmxscraper.TestApp"
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ plugins {`
`9`	`9`	`description = "JMX metrics scraper"`
`10`	`10`	`otelJava.moduleName.set("io.opentelemetry.contrib.jmxscraper")`
`11`	`11`
`12`		`-application.mainClass.set("io.opentelemetry.contrib.jmxscraper.JmxMetrics")`
	`12`	`+application.mainClass.set("io.opentelemetry.contrib.jmxscraper.JmxScraper")`
`13`	`13`
`14`	`14`	`dependencies {`
`15`	`15`	`implementation("io.opentelemetry:opentelemetry-api")`
`@@ -69,7 +69,7 @@ tasks.register<Jar>("appJar") {`
`69`	`69`	`from(sourceSets.get("integrationTest").output)`
`70`	`70`	`archiveClassifier.set("app")`
`71`	`71`	`manifest {`
`72`		`- attributes["Main-Class"] = "io.opentelemetry.contrib.jmxscraper.JmxScraper"`
	`72`	`+ attributes["Main-Class"] = "io.opentelemetry.contrib.jmxscraper.TestApp"`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`