Skip to content

Commit c77cc84

Browse files
renovate[bot]zeitlinger
renovate[bot]
and
zeitlinger
authored
Update junit5 monorepo to v5.13.0 (#1404)
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.junit:junit-bom](https://junit.org/junit5/) ([source](https://redirect.github.com/junit-team/junit5)) | `5.12.2` -> `5.13.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.junit:junit-bom/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.junit:junit-bom/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.junit:junit-bom/5.12.2/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.junit:junit-bom/5.12.2/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.junit.jupiter:junit-jupiter-params](https://junit.org/junit5/) ([source](https://redirect.github.com/junit-team/junit5)) | `5.12.2` -> `5.13.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.junit.jupiter:junit-jupiter-params/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.junit.jupiter:junit-jupiter-params/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.junit.jupiter:junit-jupiter-params/5.12.2/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.junit.jupiter:junit-jupiter-params/5.12.2/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.junit.jupiter:junit-jupiter](https://junit.org/junit5/) ([source](https://redirect.github.com/junit-team/junit5)) | `5.12.2` -> `5.13.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.junit.jupiter:junit-jupiter/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.junit.jupiter:junit-jupiter/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.junit.jupiter:junit-jupiter/5.12.2/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.junit.jupiter:junit-jupiter/5.12.2/5.13.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the warning logs for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/prometheus/client_java). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC4zMy42IiwidXBkYXRlZEluVmVyIjoiNDAuMzMuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> --------- Signed-off-by: Gregor Zeitlinger <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <[email protected]>
1 parent 3133f66 commit c77cc84

File tree

8 files changed

+199
-122
lines changed

8 files changed

+199
-122
lines changed

‎.github/workflows/native-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
uses: actions/checkout@v4
1616
- uses: jdx/mise-action@13abe502c30c1559a5c37dff303831bab82c9402 # v2.2.3
1717
env:
18-
MISE_ENABLE_TOOLS: java
18+
MISE_ENV: native
1919
- name: Run native tests
20-
run: mise run native-test
20+
run: mise run test

‎CONTRIBUTING.md‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Prometheus uses GitHub to manage reviews of pull requests.
44

55
- If you have a trivial fix or improvement, go ahead and create a pull request,
66
addressing (with `@...`) the maintainer of this repository (see
7-
[MAINTAINERS.md](https://github.com/prometheus/client_java/blob/main/MAINTAINERS.md)) in the
7+
[MAINTAINERS.md](MAINTAINERS.md)) in the
88
description of the pull request.
99

1010
- If you plan to do something more involved, first discuss your ideas
@@ -26,6 +26,12 @@ If you're getting errors when running tests:
2626
- Make sure that the IDE uses only the "Maven Shade" dependency of "
2727
prometheus-metrics-exposition-formats" and the "prometheus-metrics-tracer\*" dependencies.
2828

29+
### Running native tests
30+
31+
```shell
32+
mise --env native test
33+
```
34+
2935
### Avoid failures while running tests
3036

3137
- Use `-Dspotless.check.skip=true` to skip the formatting check during development.
@@ -34,8 +40,24 @@ If you're getting errors when running tests:
3440
- Use `-Dwarnings=-nowarn` to skip the warnings during development.
3541

3642
Combine all with
37-
`./mvnw test -DskipTests=true -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn`. # editorconfig-checker-disable-line
43+
44+
```shell
45+
./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true \
46+
-Dcheckstyle.skip=true -Dwarnings=-nowarn
47+
```
48+
49+
or simply
50+
51+
```shell
52+
mise run compile
53+
```
3854

3955
## Updating the Protobuf Java Classes
4056

41-
Use `mise up && mise run test` to generate protobuf classes.
57+
In the failing PR from renovate, run:
58+
59+
```shell
60+
mise run generate
61+
```
62+
63+
Add the new `Metrics.java` to Git and commit it.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
## Contributing and community
1010

11-
See [CONTRIBUTING.md](https://github.com/prometheus/client_java/blob/main/CONTRIBUTING.md) and
11+
See [CONTRIBUTING.md](CONTRIBUTING.md) and
1212
the [community section](http://prometheus.io/community/)
1313
of the Prometheus homepage.
1414

@@ -23,4 +23,4 @@ the [simpleclient](https://github.com/prometheus/client_java/tree/simpleclient)
2323

2424
## License
2525

26-
Apache License 2.0, see [LICENSE](https://github.com/prometheus/client_java/blob/main/LICENSE).
26+
Apache License 2.0, see [LICENSE](LICENSE).

‎integration-tests/it-spring-boot-smoke-test/pom.xml‎

Lines changed: 154 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -3,119 +3,166 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
55

6-
<modelVersion>4.0.0</modelVersion>
6+
<modelVersion>4.0.0</modelVersion>
77

8-
<parent>
9-
<groupId>org.springframework.boot</groupId>
10-
<artifactId>spring-boot-starter-parent</artifactId>
11-
<version>3.5.0</version>
12-
<relativePath/> <!-- lookup parent from repository -->
13-
</parent>
14-
15-
<groupId>io.prometheus</groupId>
16-
<artifactId>it-spring-boot-smoke-test</artifactId>
17-
<version>1.4.0-SNAPSHOT</version>
8+
<parent>
9+
<groupId>org.springframework.boot</groupId>
10+
<artifactId>spring-boot-starter-parent</artifactId>
11+
<version>3.5.0</version>
12+
<relativePath/> <!-- lookup parent from repository -->
13+
</parent>
1814

19-
<name>Integration Test - Spring Smoke Tests</name>
20-
<description>
21-
Spring Smoke Tests
22-
</description>
23-
<properties>
24-
<java.version>17</java.version>
25-
<junit-jupiter.version>5.12.2</junit-jupiter.version>
26-
</properties>
15+
<groupId>io.prometheus</groupId>
16+
<artifactId>it-spring-boot-smoke-test</artifactId>
17+
<version>1.4.0-SNAPSHOT</version>
2718

28-
<dependencyManagement>
29-
<dependencies>
30-
<dependency>
31-
<groupId>org.junit</groupId>
32-
<artifactId>junit-bom</artifactId>
33-
<version>${junit-jupiter.version}</version>
34-
<type>pom</type>
35-
<scope>import</scope>
36-
</dependency>
37-
<dependency>
38-
<groupId>io.prometheus</groupId>
39-
<artifactId>prometheus-metrics-bom</artifactId>
40-
<version>${project.version}</version>
41-
<type>pom</type>
42-
<scope>import</scope>
43-
</dependency>
44-
</dependencies>
45-
</dependencyManagement>
19+
<name>Integration Test - Spring Smoke Tests</name>
20+
<description>
21+
Spring Smoke Tests
22+
</description>
23+
<properties>
24+
<java.version>17</java.version>
25+
<junit-jupiter.version>5.13.0</junit-jupiter.version>
26+
</properties>
4627

28+
<dependencyManagement>
4729
<dependencies>
48-
<dependency>
49-
<groupId>org.springframework.boot</groupId>
50-
<artifactId>spring-boot-starter-web</artifactId>
51-
</dependency>
52-
<dependency>
53-
<groupId>org.springframework.boot</groupId>
54-
<artifactId>spring-boot-starter-actuator</artifactId>
55-
</dependency>
56-
<dependency>
57-
<groupId>io.micrometer</groupId>
58-
<artifactId>micrometer-registry-prometheus</artifactId>
59-
<scope>runtime</scope>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.springframework.boot</groupId>
63-
<artifactId>spring-boot-starter-test</artifactId>
64-
<scope>test</scope>
65-
</dependency>
66-
<dependency>
67-
<groupId>org.junit.jupiter</groupId>
68-
<artifactId>junit-jupiter-engine</artifactId>
69-
<scope>test</scope>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.junit.jupiter</groupId>
73-
<artifactId>junit-jupiter-api</artifactId>
74-
<scope>test</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.junit.platform</groupId>
78-
<artifactId>junit-platform-launcher</artifactId>
79-
<scope>test</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>io.prometheus</groupId>
83-
<artifactId>it-common</artifactId>
84-
<type>test-jar</type>
85-
<version>${project.version}</version>
86-
<scope>test</scope>
87-
</dependency>
30+
<dependency>
31+
<groupId>org.junit</groupId>
32+
<artifactId>junit-bom</artifactId>
33+
<version>${junit-jupiter.version}</version>
34+
<type>pom</type>
35+
<scope>import</scope>
36+
</dependency>
37+
<dependency>
38+
<groupId>io.prometheus</groupId>
39+
<artifactId>prometheus-metrics-bom</artifactId>
40+
<version>${project.version}</version>
41+
<type>pom</type>
42+
<scope>import</scope>
43+
</dependency>
8844
</dependencies>
45+
</dependencyManagement>
8946

90-
<build>
91-
<plugins>
92-
<plugin>
93-
<groupId>org.graalvm.buildtools</groupId>
94-
<artifactId>native-maven-plugin</artifactId>
95-
</plugin>
96-
<plugin>
97-
<groupId>org.springframework.boot</groupId>
98-
<artifactId>spring-boot-maven-plugin</artifactId>
99-
</plugin>
100-
<plugin>
101-
<groupId>com.diffplug.spotless</groupId>
102-
<artifactId>spotless-maven-plugin</artifactId>
103-
<version>2.44.5</version>
104-
<configuration>
105-
<java>
106-
<googleJavaFormat/>
107-
</java>
108-
</configuration>
109-
<executions>
110-
<execution>
111-
<phase>verify</phase>
112-
<goals>
113-
<goal>check</goal>
114-
</goals>
115-
</execution>
116-
</executions>
117-
</plugin>
118-
</plugins>
119-
</build>
47+
<dependencies>
48+
<dependency>
49+
<groupId>org.springframework.boot</groupId>
50+
<artifactId>spring-boot-starter-web</artifactId>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.springframework.boot</groupId>
54+
<artifactId>spring-boot-starter-actuator</artifactId>
55+
</dependency>
56+
<dependency>
57+
<groupId>io.micrometer</groupId>
58+
<artifactId>micrometer-registry-prometheus</artifactId>
59+
<scope>runtime</scope>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.springframework.boot</groupId>
63+
<artifactId>spring-boot-starter-test</artifactId>
64+
<scope>test</scope>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.junit.jupiter</groupId>
68+
<artifactId>junit-jupiter-engine</artifactId>
69+
<scope>test</scope>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.junit.jupiter</groupId>
73+
<artifactId>junit-jupiter-api</artifactId>
74+
<scope>test</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.junit.platform</groupId>
78+
<artifactId>junit-platform-launcher</artifactId>
79+
<scope>test</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>io.prometheus</groupId>
83+
<artifactId>it-common</artifactId>
84+
<type>test-jar</type>
85+
<version>${project.version}</version>
86+
<scope>test</scope>
87+
</dependency>
88+
</dependencies>
89+
90+
<build>
91+
<plugins>
92+
<plugin>
93+
<groupId>org.graalvm.buildtools</groupId>
94+
<artifactId>native-maven-plugin</artifactId>
95+
<configuration>
96+
<!-- editorconfig-checker-disable -->
97+
<buildArgs>
98+
<buildArg>
99+
--initialize-at-build-time=org.junit.jupiter.api.DisplayNameGenerator$IndicativeSentences
100+
</buildArg>
101+
<buildArg>
102+
--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor$ClassInfo
103+
</buildArg>
104+
<buildArg>
105+
--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor$LifecycleMethods
106+
</buildArg>
107+
<buildArg>
108+
--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor
109+
</buildArg>
110+
<buildArg>
111+
--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor
112+
</buildArg>
113+
<buildArg>
114+
--initialize-at-build-time=org.junit.jupiter.engine.descriptor.DynamicDescendantFilter$Mode
115+
</buildArg>
116+
<buildArg>
117+
--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector$1
118+
</buildArg>
119+
<buildArg>
120+
--initialize-at-build-time=org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor$MethodInfo
121+
</buildArg>
122+
<buildArg>
123+
--initialize-at-build-time=org.junit.jupiter.engine.discovery.ClassSelectorResolver$DummyClassTemplateInvocationContext
124+
</buildArg>
125+
<buildArg>
126+
--initialize-at-build-time=org.junit.platform.engine.support.store.NamespacedHierarchicalStore$EvaluatedValue
127+
</buildArg>
128+
<buildArg>--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier
129+
</buildArg>
130+
<buildArg>
131+
--initialize-at-build-time=org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider
132+
</buildArg>
133+
<buildArg>
134+
--initialize-at-build-time=org.junit.platform.launcher.core.LauncherDiscoveryResult$EngineResultInfo
135+
</buildArg>
136+
<buildArg>
137+
--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor$LifecycleMethods
138+
</buildArg>
139+
</buildArgs>
140+
<!-- editorconfig-checker-enable -->
141+
</configuration>
142+
</plugin>
143+
<plugin>
144+
<groupId>org.springframework.boot</groupId>
145+
<artifactId>spring-boot-maven-plugin</artifactId>
146+
</plugin>
147+
<plugin>
148+
<groupId>com.diffplug.spotless</groupId>
149+
<artifactId>spotless-maven-plugin</artifactId>
150+
<version>2.44.5</version>
151+
<configuration>
152+
<java>
153+
<googleJavaFormat/>
154+
</java>
155+
</configuration>
156+
<executions>
157+
<execution>
158+
<phase>verify</phase>
159+
<goals>
160+
<goal>check</goal>
161+
</goals>
162+
</execution>
163+
</executions>
164+
</plugin>
165+
</plugins>
166+
</build>
120167

121168
</project>

‎lychee.toml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ cache = true
44

55
base = "https://prometheus.github.io"
66
exclude_path = ["docs/themes"]
7-
exclude = ['^https://github\.com/prometheus/client_java/settings', '#']
7+
exclude = [
8+
'^https://github\.com/prometheus/client_java/settings',
9+
'#',
10+
'CONTRIBUTING.md',
11+
'LICENSE',
12+
'MAINTAINERS.md'
13+
]
814

915

‎mise.native.toml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[tools]
2+
java = "graalvm-community-24.0.1"
3+
4+
[tasks.test]
5+
depends = "build"
6+
run = "../../mvnw test -PnativeTest"
7+
dir = "integration-tests/it-spring-boot-smoke-test"
8+

‎mise.toml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ description = "Run OATs acceptance tests"
5555
depends = "build"
5656
run = "oats -timeout 5m examples/"
5757

58-
[tasks.native-test]
59-
depends = "build"
60-
tools.java = "graalvm-22.3.3+java17"
61-
run = "../../mvnw test -PnativeTest"
62-
dir = "integration-tests/it-spring-boot-smoke-test"
63-
6458
[tasks.set-version]
6559
run = './scripts/set-version.sh {{arg(name="version")}}'
6660

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<automatic.module.name>--module-name-need-to-be-overridden--</automatic.module.name>
2626
<protobuf-java.version>4.31.1</protobuf-java.version>
2727
<guava.version>33.4.8-jre</guava.version>
28-
<junit-jupiter.version>5.12.2</junit-jupiter.version>
28+
<junit-jupiter.version>5.13.0</junit-jupiter.version>
2929
<otel.instrumentation.version>2.16.0-alpha</otel.instrumentation.version>
3030
<java.version>8</java.version>
3131
<jacoco.line-coverage>0.70</jacoco.line-coverage>

0 commit comments

Comments
 (0)