Skip to content

Commit 6918c21

Browse files
zeitlingerzeitlinger
authored
bom should not include junit (#1359)
Fixes #1352 --------- Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent 647f7cc commit 6918c21

File tree

8 files changed

+73
-56
lines changed

8 files changed

+73
-56
lines changed

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ 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](MAINTAINERS.md)) in the description of the pull request.
7+
[MAINTAINERS.md](https://github.com/prometheus/client_java/blob/main/MAINTAINERS.md)) in the
8+
description of the pull request.
89

910
- If you plan to do something more involved, first discuss your ideas
1011
on our [mailing list](https://groups.google.com/forum/?fromgroups#!forum/prometheus-developers).

‎README.md‎

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

99
## Contributing and community
1010

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

1415
The Prometheus Java community is present on the [CNCF Slack](https://cloud-native.slack.com) on
@@ -22,4 +23,4 @@ the [simpleclient](https://github.com/prometheus/client_java/tree/simpleclient)
2223

2324
## License
2425

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

‎lychee.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
max_retries = 6
22
exclude_loopback = true
3+
cache = true
34

5+
base = "https://prometheus.github.io"
46
exclude_path = ["docs/themes"]
7+
exclude = ['^https://github\.com/prometheus/client_java/settings', '#']
8+
59

‎mise.toml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,14 @@ run = "./mvnw install -DskipTests"
3838
run = "scripts/super-linter.sh"
3939

4040
[tasks.lint-links]
41-
run = "lychee --cache --include-fragments ."
41+
run = "lychee --include-fragments ."
4242

4343
[tasks.lint-gh-actions]
4444
run = "zizmor .github/"
4545

4646
[tasks.lint-rest]
4747
description = "All lints not covered by super linter"
48-
depends = [
49-
# "lint-links", # try out first
50-
"lint-gh-actions"]
48+
depends = ["lint-links", "lint-gh-actions"]
5149

5250
[tasks.acceptance-test]
5351
description = "Run OATs acceptance tests"

‎pom.xml‎

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
<packaging>pom</packaging>
66
<modelVersion>4.0.0</modelVersion>
77

8-
<groupId>io.prometheus</groupId>
9-
<artifactId>client_java</artifactId>
8+
<parent>
9+
<groupId>io.prometheus</groupId>
10+
<artifactId>client_java_parent</artifactId>
11+
<version>1.4.0-SNAPSHOT</version>
12+
<relativePath>prometheus-metrics-parent/pom.xml</relativePath>
13+
</parent>
14+
1015
<version>1.4.0-SNAPSHOT</version>
16+
<artifactId>client_java</artifactId>
1117

1218
<name>Prometheus Metrics Library</name>
13-
<url>http://github.com/prometheus/client_java</url>
1419
<description>
1520
The Prometheus Java Metrics Library
1621
</description>
@@ -29,40 +34,8 @@
2934
<warnings>-Werror</warnings>
3035
</properties>
3136

32-
<licenses>
33-
<license>
34-
<name>The Apache Software License, Version 2.0</name>
35-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
36-
<distribution>repo</distribution>
37-
</license>
38-
</licenses>
39-
40-
<scm>
41-
<connection>scm:git:[email protected]:prometheus/client_java.git</connection>
42-
<developerConnection>scm:git:[email protected]:prometheus/client_java.git</developerConnection>
43-
<url>[email protected]:prometheus/client_java.git</url>
44-
<tag>HEAD</tag>
45-
</scm>
46-
47-
<developers>
48-
<developer>
49-
<id>fstab</id>
50-
<name>Fabian Stäber</name>
51-
<email>[email protected]</email>
52-
</developer>
53-
<developer>
54-
<id>zeitlinger</id>
55-
<name>Gregor Zeitlinger</name>
56-
<email>[email protected]</email>
57-
</developer>
58-
<developer>
59-
<id>dhoard</id>
60-
<name>Doug Hoard</name>
61-
<email>[email protected]</email>
62-
</developer>
63-
</developers>
64-
6537
<modules>
38+
<module>prometheus-metrics-parent</module>
6639
<module>prometheus-metrics-bom</module>
6740
<module>prometheus-metrics-core</module>
6841
<module>prometheus-metrics-config</module>

‎prometheus-metrics-bom/pom.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55

66
<parent>
77
<groupId>io.prometheus</groupId>
8-
<artifactId>client_java</artifactId>
8+
<artifactId>client_java_parent</artifactId>
99
<version>1.4.0-SNAPSHOT</version>
10+
<relativePath>../prometheus-metrics-parent/pom.xml</relativePath>
1011
</parent>
1112

1213
<artifactId>prometheus-metrics-bom</artifactId>
@@ -17,10 +18,6 @@
1718
Bill of Materials for the Prometheus Metrics library
1819
</description>
1920

20-
<properties>
21-
<prometheus.metrics.shaded.dependencies.version>1.3.1</prometheus.metrics.shaded.dependencies.version>
22-
</properties>
23-
2421
<dependencyManagement>
2522
<dependencies>
2623
<dependency>

‎prometheus-metrics-instrumentation-dropwizard/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,12 @@
2121
<automatic.module.name>io.prometheus.metrics.instrumentation.dropwizard</automatic.module.name>
2222
</properties>
2323

24-
<licenses>
25-
<license>
26-
<name>The Apache Software License, Version 2.0</name>
27-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
28-
<distribution>repo</distribution>
29-
</license>
30-
</licenses>
3124
<developers>
3225
<developer>
3326
<id>kingster</id>
3427
<name>Kinshuk Bairagi</name>
3528
<email>[email protected]</email>
3629
</developer>
37-
3830
</developers>
3931

4032
<dependencies>

‎prometheus-metrics-parent/pom.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
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">
5+
<packaging>pom</packaging>
6+
<modelVersion>4.0.0</modelVersion>
7+
8+
<groupId>io.prometheus</groupId>
9+
<artifactId>client_java_parent</artifactId>
10+
<version>1.4.0-SNAPSHOT</version>
11+
12+
<name>Prometheus Metrics Library Parent</name>
13+
<url>http://github.com/prometheus/client_java</url>
14+
<description>
15+
The Prometheus Java Metrics Library Parent
16+
</description>
17+
18+
<licenses>
19+
<license>
20+
<name>The Apache Software License, Version 2.0</name>
21+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
22+
<distribution>repo</distribution>
23+
</license>
24+
</licenses>
25+
26+
<scm>
27+
<connection>scm:git:[email protected]:prometheus/client_java.git</connection>
28+
<developerConnection>scm:git:[email protected]:prometheus/client_java.git</developerConnection>
29+
<url>[email protected]:prometheus/client_java.git</url>
30+
<tag>HEAD</tag>
31+
</scm>
32+
33+
<developers>
34+
<developer>
35+
<id>fstab</id>
36+
<name>Fabian Stäber</name>
37+
<email>[email protected]</email>
38+
</developer>
39+
<developer>
40+
<id>zeitlinger</id>
41+
<name>Gregor Zeitlinger</name>
42+
<email>[email protected]</email>
43+
</developer>
44+
<developer>
45+
<id>dhoard</id>
46+
<name>Doug Hoard</name>
47+
<email>[email protected]</email>
48+
</developer>
49+
</developers>
50+
51+
</project>

0 commit comments

Comments
 (0)