Skip to content

bom should not include junit #1359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Prometheus uses GitHub to manage reviews of pull requests.

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

- If you plan to do something more involved, first discuss your ideas
on our [mailing list](https://groups.google.com/forum/?fromgroups#!forum/prometheus-developers).
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

## Contributing and community

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

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

## License

Apache License 2.0, see [LICENSE](LICENSE).
Apache License 2.0, see [LICENSE](https://github.com/prometheus/client_java/blob/main/LICENSE).
4 changes: 4 additions & 0 deletions lychee.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
max_retries = 6
exclude_loopback = true
cache = true

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


6 changes: 2 additions & 4 deletions mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,14 @@ run = "./mvnw install -DskipTests"
run = "scripts/super-linter.sh"

[tasks.lint-links]
run = "lychee --cache --include-fragments ."
run = "lychee --include-fragments ."

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

[tasks.lint-rest]
description = "All lints not covered by super linter"
depends = [
# "lint-links", # try out first
"lint-gh-actions"]
depends = ["lint-links", "lint-gh-actions"]

[tasks.acceptance-test]
description = "Run OATs acceptance tests"
Expand Down
45 changes: 9 additions & 36 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>

<groupId>io.prometheus</groupId>
<artifactId>client_java</artifactId>
<parent>
<groupId>io.prometheus</groupId>
<artifactId>client_java_parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
<relativePath>prometheus-metrics-parent/pom.xml</relativePath>
</parent>

<version>1.4.0-SNAPSHOT</version>
<artifactId>client_java</artifactId>

<name>Prometheus Metrics Library</name>
<url>http://github.com/prometheus/client_java</url>
<description>
The Prometheus Java Metrics Library
</description>
Expand All @@ -29,40 +34,8 @@
<warnings>-Werror</warnings>
</properties>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<connection>scm:git:[email protected]:prometheus/client_java.git</connection>
<developerConnection>scm:git:[email protected]:prometheus/client_java.git</developerConnection>
<url>[email protected]:prometheus/client_java.git</url>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
<id>fstab</id>
<name>Fabian Stäber</name>
<email>[email protected]</email>
</developer>
<developer>
<id>zeitlinger</id>
<name>Gregor Zeitlinger</name>
<email>[email protected]</email>
</developer>
<developer>
<id>dhoard</id>
<name>Doug Hoard</name>
<email>[email protected]</email>
</developer>
</developers>

<modules>
<module>prometheus-metrics-parent</module>
<module>prometheus-metrics-bom</module>
<module>prometheus-metrics-core</module>
<module>prometheus-metrics-config</module>
Expand Down
7 changes: 2 additions & 5 deletions prometheus-metrics-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@

<parent>
<groupId>io.prometheus</groupId>
<artifactId>client_java</artifactId>
<artifactId>client_java_parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../prometheus-metrics-parent/pom.xml</relativePath>
</parent>

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

<properties>
<prometheus.metrics.shaded.dependencies.version>1.3.1</prometheus.metrics.shaded.dependencies.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down
8 changes: 0 additions & 8 deletions prometheus-metrics-instrumentation-dropwizard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,12 @@
<automatic.module.name>io.prometheus.metrics.instrumentation.dropwizard</automatic.module.name>
</properties>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>kingster</id>
<name>Kinshuk Bairagi</name>
<email>[email protected]</email>
</developer>

</developers>

<dependencies>
Expand Down
51 changes: 51 additions & 0 deletions prometheus-metrics-parent/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>

<groupId>io.prometheus</groupId>
<artifactId>client_java_parent</artifactId>
<version>1.4.0-SNAPSHOT</version>

<name>Prometheus Metrics Library Parent</name>
<url>http://github.com/prometheus/client_java</url>
<description>
The Prometheus Java Metrics Library Parent
</description>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<connection>scm:git:[email protected]:prometheus/client_java.git</connection>
<developerConnection>scm:git:[email protected]:prometheus/client_java.git</developerConnection>
<url>[email protected]:prometheus/client_java.git</url>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
<id>fstab</id>
<name>Fabian Stäber</name>
<email>[email protected]</email>
</developer>
<developer>
<id>zeitlinger</id>
<name>Gregor Zeitlinger</name>
<email>[email protected]</email>
</developer>
<developer>
<id>dhoard</id>
<name>Doug Hoard</name>
<email>[email protected]</email>
</developer>
</developers>

</project>