fix: use maven release type for release-please (#1967)

zeitlinger · web-flow · commit ff3bd2d329ac · 2026-03-19T18:06:57.000+01:00
## Summary

- Revert the v1.6.0 release commit (manifest + CHANGELOG) since the
  deploy failed — pom.xml files still had `-SNAPSHOT` versions
- Change `release-type` from `java` to `maven` in the release-please
  config so it auto-discovers and updates all `pom.xml` versions in the
  release commit
- Remove `prometheus-metrics-parent/pom.xml` from `extra-files` since
  the maven strategy handles it automatically

The `java` release type only updates CHANGELOG and the manifest. The
`maven` type does XML-aware pom.xml version updates, which is what we
need.

The v1.6.0 tag and GitHub release have already been deleted.

## Test plan

- [ ] CI passes
- [ ] After merge, release-please creates a new release PR that includes
  pom.xml version updates
- [ ] Deploy to Maven Central succeeds

---------

Signed-off-by: Gregor Zeitlinger &lt;gregor.zeitlinger@grafana.com&gt;
diff --git a/.github/config/.release-please-manifest.json b/.github/config/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "1.6.0"
+  ".": "1.5.0"
 }
diff --git a/.github/config/release-please-config.json b/.github/config/release-please-config.json
@@ -4,11 +4,8 @@
   "pull-request-footer": "> [!IMPORTANT]\n> Close and reopen this PR to trigger CI checks.",
   "packages": {
     ".": {
-      "release-type": "java",
-      "extra-files": [
-        "prometheus-metrics-parent/pom.xml",
-        "integration-tests/it-spring-boot-smoke-test/pom.xml"
-      ]
+      "release-type": "maven",
+      "extra-files": ["integration-tests/it-spring-boot-smoke-test/pom.xml"]
     }
   }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>benchmarks</artifactId>
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>examples</artifactId>
diff --git a/integration-tests/it-common/pom.xml b/integration-tests/it-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration-tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-common</artifactId>
diff --git a/integration-tests/it-exporter/it-exporter-duplicate-metrics-sample/pom.xml b/integration-tests/it-exporter/it-exporter-duplicate-metrics-sample/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter-duplicate-metrics-sample</artifactId>
diff --git a/integration-tests/it-exporter/it-exporter-httpserver-sample/pom.xml b/integration-tests/it-exporter/it-exporter-httpserver-sample/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter-httpserver-sample</artifactId>
diff --git a/integration-tests/it-exporter/it-exporter-no-protobuf/pom.xml b/integration-tests/it-exporter/it-exporter-no-protobuf/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter-no-protobuf</artifactId>
diff --git a/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml b/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter-servlet-jetty-sample</artifactId>
diff --git a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter-servlet-tomcat-sample</artifactId>
diff --git a/integration-tests/it-exporter/it-exporter-test/pom.xml b/integration-tests/it-exporter/it-exporter-test/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter-test</artifactId>
diff --git a/integration-tests/it-exporter/it-no-protobuf-test/pom.xml b/integration-tests/it-exporter/it-no-protobuf-test/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-no-protobuf-test</artifactId>
diff --git a/integration-tests/it-exporter/pom.xml b/integration-tests/it-exporter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration-tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter</artifactId>
diff --git a/integration-tests/it-pushgateway/pom.xml b/integration-tests/it-pushgateway/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration-tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-pushgateway</artifactId>
diff --git a/integration-tests/it-spring-boot-smoke-test/pom.xml b/integration-tests/it-spring-boot-smoke-test/pom.xml
@@ -14,7 +14,7 @@
 
   <groupId>io.prometheus</groupId>
   <artifactId>it-spring-boot-smoke-test</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
 
   <name>Integration Test - Spring Smoke Tests</name>
   <description>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>integration-tests</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java_parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>prometheus-metrics-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/prometheus-metrics-bom/pom.xml b/prometheus-metrics-bom/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java_parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../prometheus-metrics-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/prometheus-metrics-config/pom.xml b/prometheus-metrics-config/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-config</artifactId>
diff --git a/prometheus-metrics-core/pom.xml b/prometheus-metrics-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-core</artifactId>
diff --git a/prometheus-metrics-exporter-common/pom.xml b/prometheus-metrics-exporter-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-common</artifactId>
diff --git a/prometheus-metrics-exporter-httpserver/pom.xml b/prometheus-metrics-exporter-httpserver/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-httpserver</artifactId>
diff --git a/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml b/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-opentelemetry-otel-agent-resources</artifactId>
diff --git a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-opentelemetry</artifactId>
diff --git a/prometheus-metrics-exporter-opentelemetry/pom.xml b/prometheus-metrics-exporter-opentelemetry/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-opentelemetry-no-otel</artifactId>
diff --git a/prometheus-metrics-exporter-pushgateway/pom.xml b/prometheus-metrics-exporter-pushgateway/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-pushgateway</artifactId>
diff --git a/prometheus-metrics-exporter-servlet-jakarta/pom.xml b/prometheus-metrics-exporter-servlet-jakarta/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-servlet-jakarta</artifactId>
diff --git a/prometheus-metrics-exporter-servlet-javax/pom.xml b/prometheus-metrics-exporter-servlet-javax/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-servlet-javax</artifactId>
diff --git a/prometheus-metrics-exposition-formats-shaded/pom.xml b/prometheus-metrics-exposition-formats-shaded/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exposition-formats</artifactId>
diff --git a/prometheus-metrics-exposition-formats/pom.xml b/prometheus-metrics-exposition-formats/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exposition-formats-no-protobuf</artifactId>
diff --git a/prometheus-metrics-exposition-textformats/pom.xml b/prometheus-metrics-exposition-textformats/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exposition-textformats</artifactId>
diff --git a/prometheus-metrics-instrumentation-caffeine/pom.xml b/prometheus-metrics-instrumentation-caffeine/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-instrumentation-caffeine</artifactId>
diff --git a/prometheus-metrics-instrumentation-dropwizard/pom.xml b/prometheus-metrics-instrumentation-dropwizard/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-instrumentation-dropwizard</artifactId>
diff --git a/prometheus-metrics-instrumentation-dropwizard5/pom.xml b/prometheus-metrics-instrumentation-dropwizard5/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-instrumentation-dropwizard5</artifactId>
diff --git a/prometheus-metrics-instrumentation-guava/pom.xml b/prometheus-metrics-instrumentation-guava/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-instrumentation-guava</artifactId>
diff --git a/prometheus-metrics-instrumentation-jvm/pom.xml b/prometheus-metrics-instrumentation-jvm/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
diff --git a/prometheus-metrics-model/pom.xml b/prometheus-metrics-model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-model</artifactId>
diff --git a/prometheus-metrics-otel-support/pom.xml b/prometheus-metrics-otel-support/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-otel-support</artifactId>
diff --git a/prometheus-metrics-parent/pom.xml b/prometheus-metrics-parent/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>io.prometheus</groupId>
   <artifactId>client_java_parent</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
 
   <name>Prometheus Metrics Library Parent</name>
   <url>http://github.com/prometheus/client_java</url>
diff --git a/prometheus-metrics-simpleclient-bridge/pom.xml b/prometheus-metrics-simpleclient-bridge/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-simpleclient-bridge</artifactId>
diff --git a/prometheus-metrics-tracer/pom.xml b/prometheus-metrics-tracer/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-tracer</artifactId>
diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-common/pom.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-common/pom.xml
diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/pom.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/pom.xml
diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/pom.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/pom.xml
diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-otel/pom.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-otel/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "1.6.0"`
	`2`	`+ ".": "1.5.0"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,8 @@`
`4`	`4`	`"pull-request-footer": "> [!IMPORTANT]\n> Close and reopen this PR to trigger CI checks.",`
`5`	`5`	`"packages": {`
`6`	`6`	`".": {`
`7`		`- "release-type": "java",`
`8`		`- "extra-files": [`
`9`		`- "prometheus-metrics-parent/pom.xml",`
`10`		`- "integration-tests/it-spring-boot-smoke-test/pom.xml"`
`11`		`- ]`
	`7`	`+ "release-type": "maven",`
	`8`	`+ "extra-files": ["integration-tests/it-spring-boot-smoke-test/pom.xml"]`
`12`	`9`	`}`
`13`	`10`	`}`
`14`	`11`	`}`