diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aaa08ea7d..09d5ed337 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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). diff --git a/README.md b/README.md index 6e62e3577..227cd86af 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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). diff --git a/lychee.toml b/lychee.toml index 89155f5ab..6dae303b7 100644 --- a/lychee.toml +++ b/lychee.toml @@ -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', '#'] + diff --git a/mise.toml b/mise.toml index 3879e1102..3a83daa6d 100644 --- a/mise.toml +++ b/mise.toml @@ -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" diff --git a/pom.xml b/pom.xml index b4716bd0b..9dc4cc8f2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,17 @@ pom 4.0.0 - io.prometheus - client_java + + io.prometheus + client_java_parent + 1.4.0-SNAPSHOT + prometheus-metrics-parent/pom.xml + + 1.4.0-SNAPSHOT + client_java Prometheus Metrics Library - http://github.com/prometheus/client_java The Prometheus Java Metrics Library @@ -29,40 +34,8 @@ -Werror - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - scm:git:git@github.com:prometheus/client_java.git - scm:git:git@github.com:prometheus/client_java.git - git@github.com:prometheus/client_java.git - HEAD - - - - - fstab - Fabian Stäber - fabian@fstab.de - - - zeitlinger - Gregor Zeitlinger - gregor.zeitlinger@grafana.com - - - dhoard - Doug Hoard - doug.hoard@gmail.com - - - + prometheus-metrics-parent prometheus-metrics-bom prometheus-metrics-core prometheus-metrics-config diff --git a/prometheus-metrics-bom/pom.xml b/prometheus-metrics-bom/pom.xml index d676b988e..997a037b0 100644 --- a/prometheus-metrics-bom/pom.xml +++ b/prometheus-metrics-bom/pom.xml @@ -5,8 +5,9 @@ io.prometheus - client_java + client_java_parent 1.4.0-SNAPSHOT + ../prometheus-metrics-parent/pom.xml prometheus-metrics-bom @@ -17,10 +18,6 @@ Bill of Materials for the Prometheus Metrics library - - 1.3.1 - - diff --git a/prometheus-metrics-instrumentation-dropwizard/pom.xml b/prometheus-metrics-instrumentation-dropwizard/pom.xml index c0e4b0bf1..b174e7f53 100644 --- a/prometheus-metrics-instrumentation-dropwizard/pom.xml +++ b/prometheus-metrics-instrumentation-dropwizard/pom.xml @@ -21,20 +21,12 @@ io.prometheus.metrics.instrumentation.dropwizard - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - kingster Kinshuk Bairagi hi@kinsh.uk - diff --git a/prometheus-metrics-parent/pom.xml b/prometheus-metrics-parent/pom.xml new file mode 100644 index 000000000..61fea98a6 --- /dev/null +++ b/prometheus-metrics-parent/pom.xml @@ -0,0 +1,51 @@ + + + pom + 4.0.0 + + io.prometheus + client_java_parent + 1.4.0-SNAPSHOT + + Prometheus Metrics Library Parent + http://github.com/prometheus/client_java + + The Prometheus Java Metrics Library Parent + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:git:git@github.com:prometheus/client_java.git + scm:git:git@github.com:prometheus/client_java.git + git@github.com:prometheus/client_java.git + HEAD + + + + + fstab + Fabian Stäber + fabian@fstab.de + + + zeitlinger + Gregor Zeitlinger + gregor.zeitlinger@grafana.com + + + dhoard + Doug Hoard + doug.hoard@gmail.com + + + +