Skip to content
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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ root = true
max_line_length = 100
indent_size = 2

[{version-rules.xml,maven-wrapper.properties,checkstyle.xml,docker-compose.yaml,docker-compose.yml,Dockerfile,example_target_info.json,mise.toml,mise.lock,mvnm,mvnw.cmd,generate-protobuf.sh,super-linter.env,.gitleaksignore}]
[{version-rules.xml,maven-wrapper.properties,checkstyle.xml,docker-compose.yaml,docker-compose.yml,Dockerfile,example_target_info.json,mise.toml,mvnm,mvnw.cmd,generate-protobuf.sh,super-linter.env,.gitleaksignore}]
max_line_length = 200

[{grafana-dashboard-*.json,.editorconfig}]
Expand Down
18 changes: 0 additions & 18 deletions .github/dependabot.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ jobs:
persist-credentials: false
uses: actions/checkout@v4
- uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
env:
MISE_ENABLE_TOOLS: oats,java
- name: Run acceptance tests
run: mise run acceptance-test
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ jobs:
with:
persist-credentials: false
- uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
env:
MISE_ENABLE_TOOLS: java,protoc
- name: Cache local Maven repository
uses: actions/cache@v4
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/github-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:
fetch-tags: "true"
fetch-depth: 0
- uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
env:
MISE_ENABLE_TOOLS: hugo,java
with:
cache: "false"
- name: Setup Pages
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/lint-rest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ jobs:
persist-credentials: false
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
env:
MISE_ENABLE_TOOLS: lychee,zizmor
- name: Lint
run: mise run lint-rest
2 changes: 2 additions & 0 deletions .github/workflows/native-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ jobs:
persist-credentials: false
uses: actions/checkout@v4
- uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
env:
MISE_ENABLE_TOOLS: java
- name: Run native tests
run: mise run native-test
2 changes: 2 additions & 0 deletions .github/workflows/test-release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
with:
persist-credentials: false
- uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
env:
MISE_ENABLE_TOOLS: java
- name: Cache local Maven repository
uses: actions/cache@v4
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
<rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
<ignoreVersions>
<!-- ignore milestone releases -->
<ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
<rules>
<rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
<ignoreVersions>
<!-- ignore milestone releases -->
<ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleset>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
<rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
<ignoreVersions>
<!-- ignore milestone releases -->
<ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
<rules>
<rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
<ignoreVersions>
<!-- ignore milestone releases -->
<ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleset>
16 changes: 8 additions & 8 deletions examples/example-exporter-servlet-tomcat/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
<rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
<ignoreVersions>
<!-- ignore milestone releases -->
<ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
<rules>
<rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
<ignoreVersions>
<!-- ignore milestone releases -->
<ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleset>
16 changes: 8 additions & 8 deletions examples/example-simpleclient-bridge/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
<rule groupId="io.prometheus" artifactId="simpleclient" comparisonMethod="maven">
<ignoreVersions>
<!-- ignore alpha and beta releases -->
<ignoreVersion type="regex">.*(alpha|beta)-[0-9]</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
<rules>
<rule groupId="io.prometheus" artifactId="simpleclient" comparisonMethod="maven">
<ignoreVersions>
<!-- ignore alpha and beta releases -->
<ignoreVersion type="regex">.*(alpha|beta)-[0-9]</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleset>
6 changes: 3 additions & 3 deletions integration-tests/it-common/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
<rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
<ignoreVersions>
<!-- ignore milestone releases -->
<ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
<rules>
<rule groupId="org.apache.tomcat.embed" comparisonMethod="maven">
<ignoreVersions>
<!-- ignore milestone releases -->
<ignoreVersion type="regex">.*-M[0-9]+</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleset>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
6 changes: 3 additions & 3 deletions integration-tests/it-exporter/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
6 changes: 3 additions & 3 deletions integration-tests/it-pushgateway/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
6 changes: 3 additions & 3 deletions integration-tests/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
26 changes: 0 additions & 26 deletions mise.lock

This file was deleted.

14 changes: 6 additions & 8 deletions mise.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
[env]
PROTO_GENERATION = "true"

[tools]
"cargo:zizmor" = "latest"
"go:github.com/gohugoio/hugo" = "latest"
"go:github.com/grafana/oats" = "latest"
"cargo:zizmor" = "1.8.0"
"go:github.com/gohugoio/hugo" = "v0.147.0"
"go:github.com/grafana/oats" = "0.3.1"
java = "temurin-17.0.13+11"
lychee = "latest"
protoc = "latest"
lychee = "0.18.1"
protoc = "31.0"

[tasks.ci]
description = "CI Build"
run = "./mvnw clean install"
env.REQUIRE_PROTO_UP_TO_DATE = "true"
env.PROTO_GENERATION = "true"

[tasks.format]
description = "format source code"
Expand Down
6 changes: 3 additions & 3 deletions prometheus-metrics-bom/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
6 changes: 3 additions & 3 deletions prometheus-metrics-config/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
6 changes: 3 additions & 3 deletions prometheus-metrics-core/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
4 changes: 2 additions & 2 deletions prometheus-metrics-exporter-common/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
<rules>
</rules>
</ruleset>
4 changes: 2 additions & 2 deletions prometheus-metrics-exporter-httpserver/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
<rules>
</rules>
</ruleset>
6 changes: 3 additions & 3 deletions prometheus-metrics-exporter-opentelemetry/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
6 changes: 3 additions & 3 deletions prometheus-metrics-exporter-pushgateway/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
</ruleset>
<rules>
</rules>
</ruleset>
4 changes: 2 additions & 2 deletions prometheus-metrics-exporter-servlet-jakarta/version-rules.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ruleset comparisonMethod="maven"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<rules>
</rules>
<rules>
</rules>
</ruleset>
Loading