Skip to content

Commit 8d887a0

Browse files
Bump org.apache.maven.plugins:maven-surefire-plugin from 2.12.4 to 3.5.1 (#1132)
* Bump org.apache.maven.plugins:maven-surefire-plugin from 2.12.4 to 3.5.1 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 2.12.4 to 3.5.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-2.12.4...surefire-3.5.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * fix build Signed-off-by: Gregor Zeitlinger <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Gregor Zeitlinger <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <[email protected]>
1 parent 9af5f28 commit 8d887a0

File tree

6 files changed

+18
-25
lines changed

6 files changed

+18
-25
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
</plugin>
130130
<plugin>
131131
<artifactId>maven-surefire-plugin</artifactId>
132-
<version>2.12.4</version>
132+
<version>3.5.1</version>
133133
</plugin>
134134
<plugin>
135135
<artifactId>maven-jar-plugin</artifactId>

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void testTotalStrippedFromName() {
113113
}) {
114114
Counter counter = Counter.builder().name(name).unit(Unit.SECONDS).build();
115115
Metrics.MetricFamily protobufData = new PrometheusProtobufWriter().convert(counter.collect());
116-
assertThat(TextFormat.printer().printToString(protobufData))
116+
assertThat(TextFormat.printer().shortDebugString(protobufData))
117117
.isEqualTo(
118118
"name: \"my_counter_seconds_total\" type: COUNTER metric { counter { value: 0.0 } }");
119119
}

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private void run() throws NoSuchFieldException, IllegalAccessException {
9292
new PrometheusProtobufWriter().convert(histogram.collect());
9393
String expectedWithMetadata =
9494
"name: \"test\" type: HISTOGRAM metric { histogram { " + expected + " } }";
95-
assertThat(TextFormat.printer().printToString(protobufData))
95+
assertThat(TextFormat.printer().shortDebugString(protobufData))
9696
.as("test \"" + name + "\" failed")
9797
.isEqualTo(expectedWithMetadata);
9898
}
@@ -941,7 +941,7 @@ public void testDefaults() throws IOException {
941941

942942
// protobuf
943943
Metrics.MetricFamily protobufData = new PrometheusProtobufWriter().convert(snapshot);
944-
assertThat(TextFormat.printer().printToString(protobufData)).isEqualTo(expectedProtobuf);
944+
assertThat(TextFormat.printer().shortDebugString(protobufData)).isEqualTo(expectedProtobuf);
945945

946946
// text
947947
ByteArrayOutputStream out = new ByteArrayOutputStream();

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void testInfoStrippedFromName() {
2727
Info info = Info.builder().name(name).labelNames(labelName).build();
2828
info.addLabelValues("value");
2929
Metrics.MetricFamily protobufData = new PrometheusProtobufWriter().convert(info.collect());
30-
assertThat(TextFormat.printer().printToString(protobufData))
30+
assertThat(TextFormat.printer().shortDebugString(protobufData))
3131
.isEqualTo(
3232
"name: \"jvm_runtime_info\" type: GAUGE metric { label { name: \"my_key\" value: \"value\" } gauge { value: 1.0 } }");
3333
}

prometheus-metrics-exposition-formats/pom.xml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,18 @@
7373
</properties>
7474
</configuration>
7575
</execution>
76+
<execution>
77+
<id>add-source</id>
78+
<phase>generate-sources</phase>
79+
<goals>
80+
<goal>add-source</goal>
81+
</goals>
82+
<configuration>
83+
<sources>
84+
<source>src/main/generated/</source>
85+
</sources>
86+
</configuration>
87+
</execution>
7688
</executions>
7789
</plugin>
7890
<plugin>
@@ -97,25 +109,6 @@
97109
</execution>
98110
</executions>
99111
</plugin>
100-
<plugin>
101-
<groupId>org.codehaus.mojo</groupId>
102-
<artifactId>build-helper-maven-plugin</artifactId>
103-
<version>3.6.0</version>
104-
<executions>
105-
<execution>
106-
<id>add-source</id>
107-
<phase>generate-sources</phase>
108-
<goals>
109-
<goal>add-source</goal>
110-
</goals>
111-
<configuration>
112-
<sources>
113-
<source>src/main/generated/</source>
114-
</sources>
115-
</configuration>
116-
</execution>
117-
</executions>
118-
</plugin>
119112
<plugin>
120113
<artifactId>maven-javadoc-plugin</artifactId>
121114
<configuration>

prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2634,7 +2634,7 @@ private void assertPrometheusTextWithoutCreated(String expected, MetricSnapshot
26342634
private void assertPrometheusProtobuf(String expected, MetricSnapshot snapshot) {
26352635
PrometheusProtobufWriter writer = new PrometheusProtobufWriter();
26362636
Metrics.MetricFamily protobufData = writer.convert(snapshot);
2637-
String actual = TextFormat.printer().printToString(protobufData);
2637+
String actual = TextFormat.printer().shortDebugString(protobufData);
26382638
assertThat(actual).isEqualTo(expected);
26392639
}
26402640
}

0 commit comments

Comments
 (0)