Skip to content

Commit 89052fc

Browse files
zeitlingerzeitlinger
authored
chore: revert release 1.5.1 to re-test release-please flow (#1976)
## Summary - Revert the 1.5.1 release merge — release-please didn't create the tag/GitHub release after merge, likely because the PR title was `chore: release main` instead of `chore(main): release 1.5.1` (missing version in title prevents release-please from matching) - Re-apply the editorconfig fix (pom.xml max line length 210) - After merge, close #1974 and delete the `release-please--branches--main` branch so release-please creates a fresh PR with the correct title ## Test plan - [ ] After merge, release-please creates a new release PR with title `chore(main): release 1.5.1` - [ ] Merging that PR creates the v1.5.1 tag and GitHub release --------- Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
1 parent 3524bcf commit 89052fc

File tree

79 files changed

+292
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+292
-201
lines changed

‎.github/config/.release-please-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.5.1"
2+
".": "1.5.0"
33
}

‎CHANGELOG.md‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎benchmarks/pom.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
36
<modelVersion>4.0.0</modelVersion>
47

58
<parent>
69
<groupId>io.prometheus</groupId>
710
<artifactId>client_java</artifactId>
8-
<version>1.5.1</version>
11+
<version>1.5.0-SNAPSHOT</version>
912
</parent>
1013

1114
<artifactId>benchmarks</artifactId>
@@ -108,7 +111,8 @@
108111
<configuration>
109112
<finalName>benchmarks</finalName>
110113
<transformers>
111-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
114+
<transformer
115+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
112116
<mainClass>io.prometheus.metrics.benchmarks.BenchmarkRunner
113117
</mainClass>
114118
</transformer>

‎examples/example-custom-buckets/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<groupId>io.prometheus</groupId>
67
<artifactId>example-custom-buckets</artifactId>
7-
<version>1.5.1</version>
8+
<version>1.0-SNAPSHOT</version>
89

910
<properties>
1011
<maven.compiler.release>8</maven.compiler.release>
@@ -57,7 +58,8 @@
5758
</goals>
5859
<configuration>
5960
<transformers>
60-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
61+
<transformer
62+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
6163
<mainClass>io.prometheus.metrics.examples.custombuckets.Main</mainClass>
6264
</transformer>
6365
</transformers>

‎examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<groupId>io.prometheus</groupId>
68
<artifactId>example-greeting-service</artifactId>
7-
<version>1.5.1</version>
9+
<version>1.0-SNAPSHOT</version>
810

911
<properties>
1012
<maven.compiler.release>17</maven.compiler.release>
@@ -63,7 +65,8 @@
6365
</goals>
6466
<configuration>
6567
<transformers>
66-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
68+
<transformer
69+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
6770
<mainClass>io.prometheus.metrics.examples.otel.exemplars.greeting.Main</mainClass>
6871
</transformer>
6972
</transformers>

‎examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<groupId>io.prometheus</groupId>
68
<artifactId>example-hello-world-app</artifactId>
7-
<version>1.5.1</version>
9+
<version>1.0-SNAPSHOT</version>
810

911
<properties>
1012
<maven.compiler.release>17</maven.compiler.release>
@@ -63,7 +65,8 @@
6365
</goals>
6466
<configuration>
6567
<transformers>
66-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
68+
<transformer
69+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
6770
<mainClass>io.prometheus.metrics.examples.otel.exemplars.app.Main</mainClass>
6871
</transformer>
6972
</transformers>

‎examples/example-exemplars-tail-sampling/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<groupId>io.prometheus</groupId>
68
<artifactId>example-exemplars-tail-sampling</artifactId>
7-
<version>1.5.1</version>
9+
<version>1.0-SNAPSHOT</version>
810
<packaging>pom</packaging>
911

1012
<name>Example - Exemplars with OpenTelemetry's Tail Sampling</name>

‎examples/example-exporter-httpserver/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<groupId>io.prometheus</groupId>
68
<artifactId>example-exporter-httpserver</artifactId>
7-
<version>1.5.1</version>
9+
<version>1.0-SNAPSHOT</version>
810

911
<properties>
1012
<maven.compiler.release>8</maven.compiler.release>
@@ -57,7 +59,8 @@
5759
</goals>
5860
<configuration>
5961
<transformers>
60-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
62+
<transformer
63+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
6164
<mainClass>io.prometheus.metrics.examples.httpserver.Main</mainClass>
6265
</transformer>
6366
</transformers>

‎examples/example-exporter-multi-target/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<groupId>io.prometheus</groupId>
68
<artifactId>example-exporter-multi-target</artifactId>
7-
<version>1.5.1</version>
9+
<version>1.0-SNAPSHOT</version>
810

911
<properties>
1012
<maven.compiler.release>8</maven.compiler.release>
@@ -57,7 +59,8 @@
5759
</goals>
5860
<configuration>
5961
<transformers>
60-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
62+
<transformer
63+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
6164
<mainClass>io.prometheus.metrics.examples.multitarget.Main</mainClass>
6265
</transformer>
6366
</transformers>

‎examples/example-exporter-opentelemetry/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<groupId>io.prometheus</groupId>
68
<artifactId>example-exporter-opentelemetry</artifactId>
7-
<version>1.5.1</version>
9+
<version>1.0-SNAPSHOT</version>
810

911
<properties>
1012
<maven.compiler.release>8</maven.compiler.release>
@@ -57,7 +59,8 @@
5759
</goals>
5860
<configuration>
5961
<transformers>
60-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
62+
<transformer
63+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
6164
<mainClass>io.prometheus.metrics.examples.opentelemetry.Main</mainClass>
6265
</transformer>
6366
</transformers>

0 commit comments

Comments
 (0)