From a44f23ed55b78f88689cdbc83b5e7d1acc7cd740 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Mon, 26 May 2025 13:57:00 +0200 Subject: [PATCH 1/7] limit installed tools Signed-off-by: Gregor Zeitlinger --- .github/workflows/acceptance-tests.yml | 2 ++ .github/workflows/build.yml | 2 ++ .github/workflows/github-pages.yaml | 2 ++ .github/workflows/lint-rest.yml | 2 ++ .github/workflows/native-tests.yml | 2 ++ .github/workflows/test-release-build.yml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index 36dcc4950..159451016 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -14,5 +14,7 @@ jobs: persist-credentials: false uses: actions/checkout@v4 - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1 + env: + MISE_ENABLE: oats,java - name: Run acceptance tests run: mise run acceptance-test diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4903a7893..1242e929c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,8 @@ jobs: with: persist-credentials: false - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1 + env: + MISE_ENABLE: java,protoc - name: Cache local Maven repository uses: actions/cache@v4 with: diff --git a/.github/workflows/github-pages.yaml b/.github/workflows/github-pages.yaml index b3787b18d..23e0dd64d 100644 --- a/.github/workflows/github-pages.yaml +++ b/.github/workflows/github-pages.yaml @@ -37,6 +37,8 @@ jobs: fetch-tags: "true" fetch-depth: 0 - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1 + env: + MISE_ENABLE: hugo,java with: cache: "false" - name: Setup Pages diff --git a/.github/workflows/lint-rest.yml b/.github/workflows/lint-rest.yml index ea59725e1..5c5660994 100644 --- a/.github/workflows/lint-rest.yml +++ b/.github/workflows/lint-rest.yml @@ -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: lychee,zizmor - name: Lint run: mise run lint-rest diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml index 09646607b..13c05a428 100644 --- a/.github/workflows/native-tests.yml +++ b/.github/workflows/native-tests.yml @@ -14,5 +14,7 @@ jobs: persist-credentials: false uses: actions/checkout@v4 - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1 + env: + MISE_ENABLE: java - name: Run native tests run: mise run native-test diff --git a/.github/workflows/test-release-build.yml b/.github/workflows/test-release-build.yml index 27508f513..e8836ac4c 100644 --- a/.github/workflows/test-release-build.yml +++ b/.github/workflows/test-release-build.yml @@ -17,6 +17,8 @@ jobs: with: persist-credentials: false - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1 + env: + MISE_ENABLE: java - name: Cache local Maven repository uses: actions/cache@v4 with: From e960e5a7b4c51ad823c485e81b0fe868f6c44d24 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Mon, 26 May 2025 13:57:25 +0200 Subject: [PATCH 2/7] auto merge Signed-off-by: Gregor Zeitlinger --- renovate.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 22a994324..a48a86383 100644 --- a/renovate.json +++ b/renovate.json @@ -1,4 +1,10 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:recommended"] + "extends": [ + "config:recommended" + ], + "platformCommit": "enabled", + "automerge": true, + "dependencyDashboard": false, + "ignorePaths": ["simpleclient-archive/**"] } From a26f605ab93bd2b5baae93fecede9cfa1cf0e9c3 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Mon, 26 May 2025 13:57:55 +0200 Subject: [PATCH 3/7] don't use lockfile because renovate doesn't support it yet Signed-off-by: Gregor Zeitlinger --- .github/dependabot.yml | 18 ------------------ mise.lock | 26 -------------------------- mise.toml | 14 ++++++-------- 3 files changed, 6 insertions(+), 52 deletions(-) delete mode 100644 .github/dependabot.yml delete mode 100644 mise.lock diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index c6485ad12..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: weekly - - package-ecosystem: maven - # excluding simpleclient_archive from the update is not possible, - # only includes are supported - # when we use includes, - # we run into https://github.com/dependabot/dependabot-core/issues/10415 - # even if we limit to 1 PR at a time - # therefore we just rename pom.xml in simpleclient_archive for now - # if this becomes a problem, we can move to renovate - directory: "/" - schedule: - interval: daily diff --git a/mise.lock b/mise.lock deleted file mode 100644 index 2e460326c..000000000 --- a/mise.lock +++ /dev/null @@ -1,26 +0,0 @@ -[tools."cargo:zizmor"] -version = "1.8.0" -backend = "cargo:zizmor" - -[tools."go:github.com/gohugoio/hugo"] -version = "v0.147.0" -backend = "go:github.com/gohugoio/hugo" - -[tools."go:github.com/grafana/oats"] -version = "0.3.1" -backend = "go:github.com/grafana/oats" - -[tools.java] -version = "temurin-17.0.13+11" -backend = "core:java" - -[tools.lychee] -version = "0.18.1" -backend = "aqua:lycheeverse/lychee" - -[tools.protoc] -version = "31.0" -backend = "aqua:protocolbuffers/protobuf/protoc" - -[tools.protoc.checksums] -"protoc-31.0-linux-x86_64.zip" = "sha256:24e2ed32060b7c990d5eb00d642fde04869d7f77c6d443f609353f097799dd42" diff --git a/mise.toml b/mise.toml index 041b413c4..7ac843a33 100644 --- a/mise.toml +++ b/mise.toml @@ -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" From 2141f70ce843cf44973bdb1130912c2cc688002d Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Mon, 26 May 2025 14:02:56 +0200 Subject: [PATCH 4/7] rename pom files back Signed-off-by: Gregor Zeitlinger --- .../integration_tests/it_common/{pom.xml.bak => pom.xml} | 0 .../it_exemplars_otel_agent/{pom.xml.bak => pom.xml} | 0 .../it_exemplars_otel_sdk/{pom.xml.bak => pom.xml} | 0 .../integration_tests/it_java_versions/{pom.xml.bak => pom.xml} | 0 .../integration_tests/it_log4j2/{pom.xml.bak => pom.xml} | 0 .../integration_tests/it_pushgateway/{pom.xml.bak => pom.xml} | 0 .../it_servlet_jakarta_exporter_webxml/{pom.xml.bak => pom.xml} | 0 simpleclient-archive/integration_tests/{pom.xml.bak => pom.xml} | 0 .../simpleclient_graphite_bridge/{pom.xml.bak => pom.xml} | 0 .../simpleclient_hibernate/{pom.xml.bak => pom.xml} | 0 .../simpleclient_httpserver/{pom.xml.bak => pom.xml} | 0 simpleclient-archive/simpleclient_jetty/{pom.xml.bak => pom.xml} | 0 .../simpleclient_jetty_jdk8/{pom.xml.bak => pom.xml} | 0 simpleclient-archive/simpleclient_log4j/{pom.xml.bak => pom.xml} | 0 simpleclient-archive/simpleclient_log4j2/{pom.xml.bak => pom.xml} | 0 .../simpleclient_logback/{pom.xml.bak => pom.xml} | 0 .../simpleclient_servlet/{pom.xml.bak => pom.xml} | 0 .../simpleclient_servlet_common/{pom.xml.bak => pom.xml} | 0 .../simpleclient_servlet_jakarta/{pom.xml.bak => pom.xml} | 0 .../simpleclient_spring_web/{pom.xml.bak => pom.xml} | 0 simpleclient-archive/simpleclient_vertx/{pom.xml.bak => pom.xml} | 0 simpleclient-archive/simpleclient_vertx4/{pom.xml.bak => pom.xml} | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename simpleclient-archive/integration_tests/it_common/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/integration_tests/it_exemplars_otel_agent/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/integration_tests/it_exemplars_otel_sdk/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/integration_tests/it_java_versions/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/integration_tests/it_log4j2/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/integration_tests/it_pushgateway/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/integration_tests/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_graphite_bridge/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_hibernate/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_httpserver/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_jetty/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_jetty_jdk8/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_log4j/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_log4j2/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_logback/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_servlet/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_servlet_common/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_servlet_jakarta/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_spring_web/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_vertx/{pom.xml.bak => pom.xml} (100%) rename simpleclient-archive/simpleclient_vertx4/{pom.xml.bak => pom.xml} (100%) diff --git a/simpleclient-archive/integration_tests/it_common/pom.xml.bak b/simpleclient-archive/integration_tests/it_common/pom.xml similarity index 100% rename from simpleclient-archive/integration_tests/it_common/pom.xml.bak rename to simpleclient-archive/integration_tests/it_common/pom.xml diff --git a/simpleclient-archive/integration_tests/it_exemplars_otel_agent/pom.xml.bak b/simpleclient-archive/integration_tests/it_exemplars_otel_agent/pom.xml similarity index 100% rename from simpleclient-archive/integration_tests/it_exemplars_otel_agent/pom.xml.bak rename to simpleclient-archive/integration_tests/it_exemplars_otel_agent/pom.xml diff --git a/simpleclient-archive/integration_tests/it_exemplars_otel_sdk/pom.xml.bak b/simpleclient-archive/integration_tests/it_exemplars_otel_sdk/pom.xml similarity index 100% rename from simpleclient-archive/integration_tests/it_exemplars_otel_sdk/pom.xml.bak rename to simpleclient-archive/integration_tests/it_exemplars_otel_sdk/pom.xml diff --git a/simpleclient-archive/integration_tests/it_java_versions/pom.xml.bak b/simpleclient-archive/integration_tests/it_java_versions/pom.xml similarity index 100% rename from simpleclient-archive/integration_tests/it_java_versions/pom.xml.bak rename to simpleclient-archive/integration_tests/it_java_versions/pom.xml diff --git a/simpleclient-archive/integration_tests/it_log4j2/pom.xml.bak b/simpleclient-archive/integration_tests/it_log4j2/pom.xml similarity index 100% rename from simpleclient-archive/integration_tests/it_log4j2/pom.xml.bak rename to simpleclient-archive/integration_tests/it_log4j2/pom.xml diff --git a/simpleclient-archive/integration_tests/it_pushgateway/pom.xml.bak b/simpleclient-archive/integration_tests/it_pushgateway/pom.xml similarity index 100% rename from simpleclient-archive/integration_tests/it_pushgateway/pom.xml.bak rename to simpleclient-archive/integration_tests/it_pushgateway/pom.xml diff --git a/simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/pom.xml.bak b/simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/pom.xml similarity index 100% rename from simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/pom.xml.bak rename to simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/pom.xml diff --git a/simpleclient-archive/integration_tests/pom.xml.bak b/simpleclient-archive/integration_tests/pom.xml similarity index 100% rename from simpleclient-archive/integration_tests/pom.xml.bak rename to simpleclient-archive/integration_tests/pom.xml diff --git a/simpleclient-archive/simpleclient_graphite_bridge/pom.xml.bak b/simpleclient-archive/simpleclient_graphite_bridge/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_graphite_bridge/pom.xml.bak rename to simpleclient-archive/simpleclient_graphite_bridge/pom.xml diff --git a/simpleclient-archive/simpleclient_hibernate/pom.xml.bak b/simpleclient-archive/simpleclient_hibernate/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_hibernate/pom.xml.bak rename to simpleclient-archive/simpleclient_hibernate/pom.xml diff --git a/simpleclient-archive/simpleclient_httpserver/pom.xml.bak b/simpleclient-archive/simpleclient_httpserver/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_httpserver/pom.xml.bak rename to simpleclient-archive/simpleclient_httpserver/pom.xml diff --git a/simpleclient-archive/simpleclient_jetty/pom.xml.bak b/simpleclient-archive/simpleclient_jetty/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_jetty/pom.xml.bak rename to simpleclient-archive/simpleclient_jetty/pom.xml diff --git a/simpleclient-archive/simpleclient_jetty_jdk8/pom.xml.bak b/simpleclient-archive/simpleclient_jetty_jdk8/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_jetty_jdk8/pom.xml.bak rename to simpleclient-archive/simpleclient_jetty_jdk8/pom.xml diff --git a/simpleclient-archive/simpleclient_log4j/pom.xml.bak b/simpleclient-archive/simpleclient_log4j/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_log4j/pom.xml.bak rename to simpleclient-archive/simpleclient_log4j/pom.xml diff --git a/simpleclient-archive/simpleclient_log4j2/pom.xml.bak b/simpleclient-archive/simpleclient_log4j2/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_log4j2/pom.xml.bak rename to simpleclient-archive/simpleclient_log4j2/pom.xml diff --git a/simpleclient-archive/simpleclient_logback/pom.xml.bak b/simpleclient-archive/simpleclient_logback/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_logback/pom.xml.bak rename to simpleclient-archive/simpleclient_logback/pom.xml diff --git a/simpleclient-archive/simpleclient_servlet/pom.xml.bak b/simpleclient-archive/simpleclient_servlet/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_servlet/pom.xml.bak rename to simpleclient-archive/simpleclient_servlet/pom.xml diff --git a/simpleclient-archive/simpleclient_servlet_common/pom.xml.bak b/simpleclient-archive/simpleclient_servlet_common/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_servlet_common/pom.xml.bak rename to simpleclient-archive/simpleclient_servlet_common/pom.xml diff --git a/simpleclient-archive/simpleclient_servlet_jakarta/pom.xml.bak b/simpleclient-archive/simpleclient_servlet_jakarta/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_servlet_jakarta/pom.xml.bak rename to simpleclient-archive/simpleclient_servlet_jakarta/pom.xml diff --git a/simpleclient-archive/simpleclient_spring_web/pom.xml.bak b/simpleclient-archive/simpleclient_spring_web/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_spring_web/pom.xml.bak rename to simpleclient-archive/simpleclient_spring_web/pom.xml diff --git a/simpleclient-archive/simpleclient_vertx/pom.xml.bak b/simpleclient-archive/simpleclient_vertx/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_vertx/pom.xml.bak rename to simpleclient-archive/simpleclient_vertx/pom.xml diff --git a/simpleclient-archive/simpleclient_vertx4/pom.xml.bak b/simpleclient-archive/simpleclient_vertx4/pom.xml similarity index 100% rename from simpleclient-archive/simpleclient_vertx4/pom.xml.bak rename to simpleclient-archive/simpleclient_vertx4/pom.xml From e6b441fde988c76679cc759f53455e467a4fc0a5 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Mon, 26 May 2025 14:08:23 +0200 Subject: [PATCH 5/7] lint Signed-off-by: Gregor Zeitlinger --- renovate.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/renovate.json b/renovate.json index a48a86383..b13309d61 100644 --- a/renovate.json +++ b/renovate.json @@ -1,8 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" - ], + "extends": ["config:recommended"], "platformCommit": "enabled", "automerge": true, "dependencyDashboard": false, From a9dd1442f56e41542eae25e7e886f15efaf2821f Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Mon, 26 May 2025 14:12:15 +0200 Subject: [PATCH 6/7] limit installed tools Signed-off-by: Gregor Zeitlinger --- .github/workflows/acceptance-tests.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/github-pages.yaml | 2 +- .github/workflows/lint-rest.yml | 2 +- .github/workflows/native-tests.yml | 2 +- .github/workflows/test-release-build.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index 159451016..fcd7ce0e8 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -15,6 +15,6 @@ jobs: uses: actions/checkout@v4 - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1 env: - MISE_ENABLE: oats,java + MISE_ENABLE_TOOLS: oats,java - name: Run acceptance tests run: mise run acceptance-test diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1242e929c..3b132c397 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: persist-credentials: false - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1 env: - MISE_ENABLE: java,protoc + MISE_ENABLE_TOOLS: java,protoc - name: Cache local Maven repository uses: actions/cache@v4 with: diff --git a/.github/workflows/github-pages.yaml b/.github/workflows/github-pages.yaml index 23e0dd64d..3ccd3fc70 100644 --- a/.github/workflows/github-pages.yaml +++ b/.github/workflows/github-pages.yaml @@ -38,7 +38,7 @@ jobs: fetch-depth: 0 - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1 env: - MISE_ENABLE: hugo,java + MISE_ENABLE_TOOLS: hugo,java with: cache: "false" - name: Setup Pages diff --git a/.github/workflows/lint-rest.yml b/.github/workflows/lint-rest.yml index 5c5660994..61790b96d 100644 --- a/.github/workflows/lint-rest.yml +++ b/.github/workflows/lint-rest.yml @@ -15,6 +15,6 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1 env: - MISE_ENABLE: lychee,zizmor + MISE_ENABLE_TOOLS: lychee,zizmor - name: Lint run: mise run lint-rest diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml index 13c05a428..1cf767c39 100644 --- a/.github/workflows/native-tests.yml +++ b/.github/workflows/native-tests.yml @@ -15,6 +15,6 @@ jobs: uses: actions/checkout@v4 - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1 env: - MISE_ENABLE: java + MISE_ENABLE_TOOLS: java - name: Run native tests run: mise run native-test diff --git a/.github/workflows/test-release-build.yml b/.github/workflows/test-release-build.yml index e8836ac4c..3f664d898 100644 --- a/.github/workflows/test-release-build.yml +++ b/.github/workflows/test-release-build.yml @@ -18,7 +18,7 @@ jobs: persist-credentials: false - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1 env: - MISE_ENABLE: java + MISE_ENABLE_TOOLS: java - name: Cache local Maven repository uses: actions/cache@v4 with: From 4ae12ed82584a958ebde53380e0c87f0961ea4ba Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Mon, 26 May 2025 14:25:34 +0200 Subject: [PATCH 7/7] lint Signed-off-by: Gregor Zeitlinger --- .editorconfig | 2 +- .../version-rules.xml | 16 +- .../example-hello-world-app/version-rules.xml | 16 +- .../version-rules.xml | 16 +- .../version-rules.xml | 16 +- integration-tests/it-common/version-rules.xml | 6 +- .../version-rules.xml | 6 +- .../version-rules.xml | 6 +- .../version-rules.xml | 16 +- .../it-exporter-test/version-rules.xml | 6 +- .../it-exporter/version-rules.xml | 6 +- .../it-pushgateway/version-rules.xml | 6 +- integration-tests/version-rules.xml | 6 +- prometheus-metrics-bom/version-rules.xml | 6 +- prometheus-metrics-config/version-rules.xml | 6 +- prometheus-metrics-core/version-rules.xml | 6 +- .../version-rules.xml | 4 +- .../version-rules.xml | 4 +- .../version-rules.xml | 6 +- .../version-rules.xml | 6 +- .../version-rules.xml | 4 +- .../version-rules.xml | 4 +- .../generate-protobuf.sh | 1 - .../version-rules.xml | 6 +- .../version-rules.xml | 6 +- .../version-rules.xml | 4 +- .../version-rules.xml | 6 +- .../version-rules.xml | 6 +- .../version-rules.xml | 4 +- prometheus-metrics-model/version-rules.xml | 6 +- .../version-rules.xml | 16 +- .../version-rules.xml | 6 +- .../version-rules.xml | 6 +- .../version-rules.xml | 6 +- .../version-rules.xml | 6 +- prometheus-metrics-tracer/version-rules.xml | 6 +- .../it_common/version-rules.xml | 6 +- .../it_exemplars_otel_agent/version-rules.xml | 14 +- .../it_exemplars_otel_sdk/version-rules.xml | 6 +- .../it_java_versions/pom.xml | 3 +- .../it_java_versions/version-rules.xml | 6 +- .../integration_tests/it_log4j2/pom.xml | 181 +++++++++--------- .../it_log4j2/version-rules.xml | 6 +- .../integration_tests/it_pushgateway/pom.xml | 6 +- .../it_pushgateway/version-rules.xml | 14 +- .../version-rules.xml | 14 +- .../integration_tests/pom.xml | 122 ++++++------ .../integration_tests/version-rules.xml | 14 +- .../simpleclient_graphite_bridge/pom.xml | 40 ++-- .../version-rules.xml | 6 +- .../simpleclient_hibernate/pom.xml | 54 +++--- .../simpleclient_hibernate/version-rules.xml | 6 +- .../simpleclient_httpserver/pom.xml | 64 +++---- .../simpleclient_httpserver/version-rules.xml | 6 +- .../simpleclient_jetty/pom.xml | 80 ++++---- .../simpleclient_jetty/version-rules.xml | 6 +- .../simpleclient_jetty_jdk8/pom.xml | 74 +++---- .../simpleclient_jetty_jdk8/version-rules.xml | 6 +- .../simpleclient_log4j/pom.xml | 64 +++---- .../simpleclient_log4j/version-rules.xml | 6 +- .../simpleclient_log4j2/pom.xml | 52 ++--- .../simpleclient_log4j2/version-rules.xml | 6 +- .../simpleclient_logback/pom.xml | 50 ++--- .../simpleclient_logback/version-rules.xml | 14 +- .../simpleclient_servlet/pom.xml | 93 ++++----- .../simpleclient_servlet/version-rules.xml | 16 +- .../simpleclient_servlet_common/pom.xml | 57 +++--- .../version-rules.xml | 6 +- .../simpleclient_servlet_jakarta/pom.xml | 93 ++++----- .../version-rules.xml | 6 +- .../simpleclient_spring_web/pom.xml | 121 ++++++------ .../simpleclient_spring_web/version-rules.xml | 16 +- .../simpleclient_vertx/pom.xml | 69 +++---- .../simpleclient_vertx/version-rules.xml | 16 +- .../simpleclient_vertx4/pom.xml | 69 +++---- .../simpleclient_vertx4/version-rules.xml | 6 +- version-rules.xml | 4 +- 77 files changed, 881 insertions(+), 872 deletions(-) diff --git a/.editorconfig b/.editorconfig index 1ade83fa3..69d2a4d5f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -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}] diff --git a/examples/example-exemplars-tail-sampling/example-greeting-service/version-rules.xml b/examples/example-exemplars-tail-sampling/example-greeting-service/version-rules.xml index 7b60b893a..154e67489 100644 --- a/examples/example-exemplars-tail-sampling/example-greeting-service/version-rules.xml +++ b/examples/example-exemplars-tail-sampling/example-greeting-service/version-rules.xml @@ -1,12 +1,12 @@ - - - - - .*-M[0-9]+ - - - + + + + + .*-M[0-9]+ + + + diff --git a/examples/example-exemplars-tail-sampling/example-hello-world-app/version-rules.xml b/examples/example-exemplars-tail-sampling/example-hello-world-app/version-rules.xml index 7b60b893a..154e67489 100644 --- a/examples/example-exemplars-tail-sampling/example-hello-world-app/version-rules.xml +++ b/examples/example-exemplars-tail-sampling/example-hello-world-app/version-rules.xml @@ -1,12 +1,12 @@ - - - - - .*-M[0-9]+ - - - + + + + + .*-M[0-9]+ + + + diff --git a/examples/example-exporter-servlet-tomcat/version-rules.xml b/examples/example-exporter-servlet-tomcat/version-rules.xml index 7b60b893a..154e67489 100644 --- a/examples/example-exporter-servlet-tomcat/version-rules.xml +++ b/examples/example-exporter-servlet-tomcat/version-rules.xml @@ -1,12 +1,12 @@ - - - - - .*-M[0-9]+ - - - + + + + + .*-M[0-9]+ + + + diff --git a/examples/example-simpleclient-bridge/version-rules.xml b/examples/example-simpleclient-bridge/version-rules.xml index 366b579fe..388ad5670 100644 --- a/examples/example-simpleclient-bridge/version-rules.xml +++ b/examples/example-simpleclient-bridge/version-rules.xml @@ -1,12 +1,12 @@ - - - - - .*(alpha|beta)-[0-9] - - - + + + + + .*(alpha|beta)-[0-9] + + + diff --git a/integration-tests/it-common/version-rules.xml b/integration-tests/it-common/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/integration-tests/it-common/version-rules.xml +++ b/integration-tests/it-common/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/integration-tests/it-exporter/it-exporter-httpserver-sample/version-rules.xml b/integration-tests/it-exporter/it-exporter-httpserver-sample/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/integration-tests/it-exporter/it-exporter-httpserver-sample/version-rules.xml +++ b/integration-tests/it-exporter/it-exporter-httpserver-sample/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/version-rules.xml b/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/version-rules.xml +++ b/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/version-rules.xml b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/version-rules.xml index 7b60b893a..154e67489 100644 --- a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/version-rules.xml +++ b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/version-rules.xml @@ -1,12 +1,12 @@ - - - - - .*-M[0-9]+ - - - + + + + + .*-M[0-9]+ + + + diff --git a/integration-tests/it-exporter/it-exporter-test/version-rules.xml b/integration-tests/it-exporter/it-exporter-test/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/integration-tests/it-exporter/it-exporter-test/version-rules.xml +++ b/integration-tests/it-exporter/it-exporter-test/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/integration-tests/it-exporter/version-rules.xml b/integration-tests/it-exporter/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/integration-tests/it-exporter/version-rules.xml +++ b/integration-tests/it-exporter/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/integration-tests/it-pushgateway/version-rules.xml b/integration-tests/it-pushgateway/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/integration-tests/it-pushgateway/version-rules.xml +++ b/integration-tests/it-pushgateway/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/integration-tests/version-rules.xml b/integration-tests/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/integration-tests/version-rules.xml +++ b/integration-tests/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-bom/version-rules.xml b/prometheus-metrics-bom/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-bom/version-rules.xml +++ b/prometheus-metrics-bom/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-config/version-rules.xml b/prometheus-metrics-config/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-config/version-rules.xml +++ b/prometheus-metrics-config/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-core/version-rules.xml b/prometheus-metrics-core/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-core/version-rules.xml +++ b/prometheus-metrics-core/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-exporter-common/version-rules.xml b/prometheus-metrics-exporter-common/version-rules.xml index 5c6d39593..dd2063cfd 100644 --- a/prometheus-metrics-exporter-common/version-rules.xml +++ b/prometheus-metrics-exporter-common/version-rules.xml @@ -1,6 +1,6 @@ - - + + diff --git a/prometheus-metrics-exporter-httpserver/version-rules.xml b/prometheus-metrics-exporter-httpserver/version-rules.xml index 5c6d39593..dd2063cfd 100644 --- a/prometheus-metrics-exporter-httpserver/version-rules.xml +++ b/prometheus-metrics-exporter-httpserver/version-rules.xml @@ -1,6 +1,6 @@ - - + + diff --git a/prometheus-metrics-exporter-opentelemetry/version-rules.xml b/prometheus-metrics-exporter-opentelemetry/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-exporter-opentelemetry/version-rules.xml +++ b/prometheus-metrics-exporter-opentelemetry/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-exporter-pushgateway/version-rules.xml b/prometheus-metrics-exporter-pushgateway/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-exporter-pushgateway/version-rules.xml +++ b/prometheus-metrics-exporter-pushgateway/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-exporter-servlet-jakarta/version-rules.xml b/prometheus-metrics-exporter-servlet-jakarta/version-rules.xml index 5c6d39593..dd2063cfd 100644 --- a/prometheus-metrics-exporter-servlet-jakarta/version-rules.xml +++ b/prometheus-metrics-exporter-servlet-jakarta/version-rules.xml @@ -1,6 +1,6 @@ - - + + diff --git a/prometheus-metrics-exporter-servlet-javax/version-rules.xml b/prometheus-metrics-exporter-servlet-javax/version-rules.xml index 5c6d39593..dd2063cfd 100644 --- a/prometheus-metrics-exporter-servlet-javax/version-rules.xml +++ b/prometheus-metrics-exporter-servlet-javax/version-rules.xml @@ -1,6 +1,6 @@ - - + + diff --git a/prometheus-metrics-exposition-formats/generate-protobuf.sh b/prometheus-metrics-exposition-formats/generate-protobuf.sh index 1e747a252..b0e55bc4a 100755 --- a/prometheus-metrics-exposition-formats/generate-protobuf.sh +++ b/prometheus-metrics-exposition-formats/generate-protobuf.sh @@ -42,7 +42,6 @@ if [[ $GENERATED_WITH != "$PROTOBUF_VERSION" ]]; then exit 1 fi -git checkout -- ../mise.lock # see https://github.com/jdx/mise/discussions/4782 STATUS=$(git status --porcelain) if [[ ${REQUIRE_PROTO_UP_TO_DATE:-false} == "true" && -n "$STATUS" ]]; then echo "Please use https://mise.jdx.dev/ - this will use the version specified in mise.toml" diff --git a/prometheus-metrics-exposition-formats/version-rules.xml b/prometheus-metrics-exposition-formats/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-exposition-formats/version-rules.xml +++ b/prometheus-metrics-exposition-formats/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-instrumentation-caffeine/version-rules.xml b/prometheus-metrics-instrumentation-caffeine/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-instrumentation-caffeine/version-rules.xml +++ b/prometheus-metrics-instrumentation-caffeine/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-instrumentation-dropwizard/version-rules.xml b/prometheus-metrics-instrumentation-dropwizard/version-rules.xml index 5c6d39593..dd2063cfd 100644 --- a/prometheus-metrics-instrumentation-dropwizard/version-rules.xml +++ b/prometheus-metrics-instrumentation-dropwizard/version-rules.xml @@ -1,6 +1,6 @@ - - + + diff --git a/prometheus-metrics-instrumentation-dropwizard5/version-rules.xml b/prometheus-metrics-instrumentation-dropwizard5/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-instrumentation-dropwizard5/version-rules.xml +++ b/prometheus-metrics-instrumentation-dropwizard5/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-instrumentation-guava/version-rules.xml b/prometheus-metrics-instrumentation-guava/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-instrumentation-guava/version-rules.xml +++ b/prometheus-metrics-instrumentation-guava/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-instrumentation-jvm/version-rules.xml b/prometheus-metrics-instrumentation-jvm/version-rules.xml index 5c6d39593..dd2063cfd 100644 --- a/prometheus-metrics-instrumentation-jvm/version-rules.xml +++ b/prometheus-metrics-instrumentation-jvm/version-rules.xml @@ -1,6 +1,6 @@ - - + + diff --git a/prometheus-metrics-model/version-rules.xml b/prometheus-metrics-model/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-model/version-rules.xml +++ b/prometheus-metrics-model/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-simpleclient-bridge/version-rules.xml b/prometheus-metrics-simpleclient-bridge/version-rules.xml index c0e533e9e..6c0100118 100644 --- a/prometheus-metrics-simpleclient-bridge/version-rules.xml +++ b/prometheus-metrics-simpleclient-bridge/version-rules.xml @@ -1,12 +1,12 @@ - - - - - .*(alpha|beta)-[0-9] - - - + + + + + .*(alpha|beta)-[0-9] + + + diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-common/version-rules.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-common/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-tracer/prometheus-metrics-tracer-common/version-rules.xml +++ b/prometheus-metrics-tracer/prometheus-metrics-tracer-common/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/version-rules.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/version-rules.xml +++ b/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/version-rules.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/version-rules.xml +++ b/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-otel/version-rules.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-otel/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-tracer/prometheus-metrics-tracer-otel/version-rules.xml +++ b/prometheus-metrics-tracer/prometheus-metrics-tracer-otel/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/prometheus-metrics-tracer/version-rules.xml b/prometheus-metrics-tracer/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/prometheus-metrics-tracer/version-rules.xml +++ b/prometheus-metrics-tracer/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/integration_tests/it_common/version-rules.xml b/simpleclient-archive/integration_tests/it_common/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/integration_tests/it_common/version-rules.xml +++ b/simpleclient-archive/integration_tests/it_common/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/integration_tests/it_exemplars_otel_agent/version-rules.xml b/simpleclient-archive/integration_tests/it_exemplars_otel_agent/version-rules.xml index fcb275534..2cd86fb7b 100644 --- a/simpleclient-archive/integration_tests/it_exemplars_otel_agent/version-rules.xml +++ b/simpleclient-archive/integration_tests/it_exemplars_otel_agent/version-rules.xml @@ -1,11 +1,11 @@ - - - - .*alpha.* - - - + + + + .*alpha.* + + + diff --git a/simpleclient-archive/integration_tests/it_exemplars_otel_sdk/version-rules.xml b/simpleclient-archive/integration_tests/it_exemplars_otel_sdk/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/integration_tests/it_exemplars_otel_sdk/version-rules.xml +++ b/simpleclient-archive/integration_tests/it_exemplars_otel_sdk/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/integration_tests/it_java_versions/pom.xml b/simpleclient-archive/integration_tests/it_java_versions/pom.xml index 8e978b514..19587bcc3 100644 --- a/simpleclient-archive/integration_tests/it_java_versions/pom.xml +++ b/simpleclient-archive/integration_tests/it_java_versions/pom.xml @@ -65,7 +65,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs - + io.prometheus.client.it.java_versions.ExampleApplication diff --git a/simpleclient-archive/integration_tests/it_java_versions/version-rules.xml b/simpleclient-archive/integration_tests/it_java_versions/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/integration_tests/it_java_versions/version-rules.xml +++ b/simpleclient-archive/integration_tests/it_java_versions/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/integration_tests/it_log4j2/pom.xml b/simpleclient-archive/integration_tests/it_log4j2/pom.xml index 5b93fa85d..384e1de43 100644 --- a/simpleclient-archive/integration_tests/it_log4j2/pom.xml +++ b/simpleclient-archive/integration_tests/it_log4j2/pom.xml @@ -1,98 +1,99 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - io.prometheus - integration_tests - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + integration_tests + 1.0.0-beta-2-SNAPSHOT + - it_log4j2 - Integration Tests - log4j2 + it_log4j2 + Integration Tests - log4j2 - - 2.17.2 - - - + + 2.17.2 + + + - - - io.prometheus - simpleclient - ${project.version} - - - io.prometheus - simpleclient_log4j2 - ${project.version} - - - io.prometheus - simpleclient_httpserver - ${project.version} - - - org.apache.logging.log4j - log4j-api - ${log4j2.version} - - - org.apache.logging.log4j - log4j-core - ${log4j2.version} - - - org.testcontainers - testcontainers - test - - - ch.qos.logback - logback-classic - test - - - io.prometheus - it_common - test-jar - ${project.version} - test - - - com.squareup.okhttp3 - okhttp - test - - + + + io.prometheus + simpleclient + ${project.version} + + + io.prometheus + simpleclient_log4j2 + ${project.version} + + + io.prometheus + simpleclient_httpserver + ${project.version} + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + + + org.testcontainers + testcontainers + test + + + ch.qos.logback + logback-classic + test + + + io.prometheus + it_common + test-jar + ${project.version} + test + + + com.squareup.okhttp3 + okhttp + test + + - - - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - - - io.prometheus.client.it.log4j2.ExampleApplication - - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + io.prometheus.client.it.log4j2.ExampleApplication + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + diff --git a/simpleclient-archive/integration_tests/it_log4j2/version-rules.xml b/simpleclient-archive/integration_tests/it_log4j2/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/integration_tests/it_log4j2/version-rules.xml +++ b/simpleclient-archive/integration_tests/it_log4j2/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/integration_tests/it_pushgateway/pom.xml b/simpleclient-archive/integration_tests/it_pushgateway/pom.xml index 5bee9b860..4be9bb954 100644 --- a/simpleclient-archive/integration_tests/it_pushgateway/pom.xml +++ b/simpleclient-archive/integration_tests/it_pushgateway/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -62,7 +62,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs - + + simpleclient-archive/integration_tests/it_pushgateway/pom.xml io.prometheus.client.it.pushgateway.ExampleBatchJob diff --git a/simpleclient-archive/integration_tests/it_pushgateway/version-rules.xml b/simpleclient-archive/integration_tests/it_pushgateway/version-rules.xml index fcb275534..2cd86fb7b 100644 --- a/simpleclient-archive/integration_tests/it_pushgateway/version-rules.xml +++ b/simpleclient-archive/integration_tests/it_pushgateway/version-rules.xml @@ -1,11 +1,11 @@ - - - - .*alpha.* - - - + + + + .*alpha.* + + + diff --git a/simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/version-rules.xml b/simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/version-rules.xml index fcb275534..2cd86fb7b 100644 --- a/simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/version-rules.xml +++ b/simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/version-rules.xml @@ -1,11 +1,11 @@ - - - - .*alpha.* - - - + + + + .*alpha.* + + + diff --git a/simpleclient-archive/integration_tests/pom.xml b/simpleclient-archive/integration_tests/pom.xml index 473d84805..ecaddd212 100644 --- a/simpleclient-archive/integration_tests/pom.xml +++ b/simpleclient-archive/integration_tests/pom.xml @@ -1,69 +1,69 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - integration_tests - pom + integration_tests + pom - Prometheus Java Suit - Integration Tests + Prometheus Java Suit - Integration Tests - - it_exemplars_otel_sdk - it_exemplars_otel_agent - it_java_versions - it_servlet_jakarta_exporter_webxml - it_common - it_pushgateway - it_log4j2 - + + it_exemplars_otel_sdk + it_exemplars_otel_agent + it_java_versions + it_servlet_jakarta_exporter_webxml + it_common + it_pushgateway + it_log4j2 + - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - integration-test - integration-test - - integration-test - verify - - - - - - - - - - - org.testcontainers - testcontainers - 1.17.2 - test - - - com.squareup.okhttp3 - okhttp - 4.10.0 - test - - - ch.qos.logback - logback-classic - 1.2.11 - test - - - + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-test + integration-test + + integration-test + verify + + + + + + + + + + + org.testcontainers + testcontainers + 1.17.2 + test + + + com.squareup.okhttp3 + okhttp + 4.10.0 + test + + + ch.qos.logback + logback-classic + 1.2.11 + test + + + diff --git a/simpleclient-archive/integration_tests/version-rules.xml b/simpleclient-archive/integration_tests/version-rules.xml index fcb275534..2cd86fb7b 100644 --- a/simpleclient-archive/integration_tests/version-rules.xml +++ b/simpleclient-archive/integration_tests/version-rules.xml @@ -1,11 +1,11 @@ - - - - .*alpha.* - - - + + + + .*alpha.* + + + diff --git a/simpleclient-archive/simpleclient_graphite_bridge/pom.xml b/simpleclient-archive/simpleclient_graphite_bridge/pom.xml index f9ca51fb6..612097f25 100644 --- a/simpleclient-archive/simpleclient_graphite_bridge/pom.xml +++ b/simpleclient-archive/simpleclient_graphite_bridge/pom.xml @@ -1,27 +1,27 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_graphite_bridge - bundle + simpleclient_graphite_bridge + bundle - Prometheus Java Simpleclient Graphite Bridge - - Graphite bridge for the simpleclient. - + Prometheus Java Simpleclient Graphite Bridge + + Graphite bridge for the simpleclient. + - - - io.prometheus - simpleclient - ${project.version} - - + + + io.prometheus + simpleclient + ${project.version} + + diff --git a/simpleclient-archive/simpleclient_graphite_bridge/version-rules.xml b/simpleclient-archive/simpleclient_graphite_bridge/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/simpleclient_graphite_bridge/version-rules.xml +++ b/simpleclient-archive/simpleclient_graphite_bridge/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/simpleclient_hibernate/pom.xml b/simpleclient-archive/simpleclient_hibernate/pom.xml index b07f2728e..6c90ac93b 100644 --- a/simpleclient-archive/simpleclient_hibernate/pom.xml +++ b/simpleclient-archive/simpleclient_hibernate/pom.xml @@ -1,36 +1,36 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_hibernate - bundle + simpleclient_hibernate + bundle - Prometheus Java Simpleclient Hibernate - - Collectors of data from Hibernate. - + Prometheus Java Simpleclient Hibernate + + Collectors of data from Hibernate. + - + - - io.prometheus - simpleclient - ${project.version} - + + io.prometheus + simpleclient + ${project.version} + - - - org.hibernate - hibernate-core - 6.1.0.Final - provided - - + + + org.hibernate + hibernate-core + 6.1.0.Final + provided + + diff --git a/simpleclient-archive/simpleclient_hibernate/version-rules.xml b/simpleclient-archive/simpleclient_hibernate/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/simpleclient_hibernate/version-rules.xml +++ b/simpleclient-archive/simpleclient_hibernate/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/simpleclient_httpserver/pom.xml b/simpleclient-archive/simpleclient_httpserver/pom.xml index 638c26433..efcc225eb 100644 --- a/simpleclient-archive/simpleclient_httpserver/pom.xml +++ b/simpleclient-archive/simpleclient_httpserver/pom.xml @@ -1,39 +1,39 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_httpserver - bundle + simpleclient_httpserver + bundle - Prometheus Java Simpleclient Httpserver - - Httpserver exposition for the simpleclient. - + Prometheus Java Simpleclient Httpserver + + Httpserver exposition for the simpleclient. + - - - io.prometheus - simpleclient - ${project.version} - - - io.prometheus - simpleclient_common - ${project.version} - - - - javax.xml.bind - jaxb-api - 2.4.0-b180830.0359 - test - - + + + io.prometheus + simpleclient + ${project.version} + + + io.prometheus + simpleclient_common + ${project.version} + + + + javax.xml.bind + jaxb-api + 2.4.0-b180830.0359 + test + + diff --git a/simpleclient-archive/simpleclient_httpserver/version-rules.xml b/simpleclient-archive/simpleclient_httpserver/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/simpleclient_httpserver/version-rules.xml +++ b/simpleclient-archive/simpleclient_httpserver/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/simpleclient_jetty/pom.xml b/simpleclient-archive/simpleclient_jetty/pom.xml index 2816e3ca3..8cbc5a604 100644 --- a/simpleclient-archive/simpleclient_jetty/pom.xml +++ b/simpleclient-archive/simpleclient_jetty/pom.xml @@ -1,48 +1,48 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_jetty - bundle + simpleclient_jetty + bundle - Prometheus Java Simpleclient Jetty - - Collector of data from Jetty StatisticsHandler. - + Prometheus Java Simpleclient Jetty + + Collector of data from Jetty StatisticsHandler. + - - 10.0.24 - + + 10.0.24 + - - - io.prometheus - simpleclient - ${project.version} - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - org.hamcrest - hamcrest-all - 1.3 - test - - + + + io.prometheus + simpleclient + ${project.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + + org.hamcrest + hamcrest-all + 1.3 + test + + diff --git a/simpleclient-archive/simpleclient_jetty/version-rules.xml b/simpleclient-archive/simpleclient_jetty/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/simpleclient_jetty/version-rules.xml +++ b/simpleclient-archive/simpleclient_jetty/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/simpleclient_jetty_jdk8/pom.xml b/simpleclient-archive/simpleclient_jetty_jdk8/pom.xml index a2bed2971..2cd3ce7ed 100644 --- a/simpleclient-archive/simpleclient_jetty_jdk8/pom.xml +++ b/simpleclient-archive/simpleclient_jetty_jdk8/pom.xml @@ -1,44 +1,44 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_jetty_jdk8 - bundle + simpleclient_jetty_jdk8 + bundle - Prometheus Java Simpleclient Jetty JDK 8 - - Collector of data from Jetty Statistics for Jetty versions which require JDK 8. - + Prometheus Java Simpleclient Jetty JDK 8 + + Collector of data from Jetty Statistics for Jetty versions which require JDK 8. + - - - io.prometheus - simpleclient - ${project.version} - - - org.eclipse.jetty - jetty-server - 11.0.24 - - - org.eclipse.jetty - jetty-servlet - 11.0.9 - - - - org.hamcrest - hamcrest-all - 1.3 - test - - + + + io.prometheus + simpleclient + ${project.version} + + + org.eclipse.jetty + jetty-server + 11.0.24 + + + org.eclipse.jetty + jetty-servlet + 11.0.9 + + + + org.hamcrest + hamcrest-all + 1.3 + test + + diff --git a/simpleclient-archive/simpleclient_jetty_jdk8/version-rules.xml b/simpleclient-archive/simpleclient_jetty_jdk8/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/simpleclient_jetty_jdk8/version-rules.xml +++ b/simpleclient-archive/simpleclient_jetty_jdk8/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/simpleclient_log4j/pom.xml b/simpleclient-archive/simpleclient_log4j/pom.xml index c96577393..0942c1d9d 100644 --- a/simpleclient-archive/simpleclient_log4j/pom.xml +++ b/simpleclient-archive/simpleclient_log4j/pom.xml @@ -1,39 +1,39 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_log4j - bundle + simpleclient_log4j + bundle - Prometheus Java Simpleclient log4j - - Metrics collector for log4j appender logging - + Prometheus Java Simpleclient log4j + + Metrics collector for log4j appender logging + - - - io.prometheus - simpleclient - ${project.version} - - - org.apache.logging.log4j - log4j-core - 2.17.2 - provided - - - org.apache.logging.log4j - log4j-1.2-api - 2.17.2 - provided - - + + + io.prometheus + simpleclient + ${project.version} + + + org.apache.logging.log4j + log4j-core + 2.17.2 + provided + + + org.apache.logging.log4j + log4j-1.2-api + 2.17.2 + provided + + diff --git a/simpleclient-archive/simpleclient_log4j/version-rules.xml b/simpleclient-archive/simpleclient_log4j/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/simpleclient_log4j/version-rules.xml +++ b/simpleclient-archive/simpleclient_log4j/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/simpleclient_log4j2/pom.xml b/simpleclient-archive/simpleclient_log4j2/pom.xml index 05e194472..5627f0660 100644 --- a/simpleclient-archive/simpleclient_log4j2/pom.xml +++ b/simpleclient-archive/simpleclient_log4j2/pom.xml @@ -1,33 +1,33 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_log4j2 - bundle + simpleclient_log4j2 + bundle - Prometheus Java Simpleclient log4j2 - - Metrics collector for log4j2 appender logging - + Prometheus Java Simpleclient log4j2 + + Metrics collector for log4j2 appender logging + - - - io.prometheus - simpleclient - ${project.version} - - - org.apache.logging.log4j - log4j-core - 2.17.2 - provided - - + + + io.prometheus + simpleclient + ${project.version} + + + org.apache.logging.log4j + log4j-core + 2.17.2 + provided + + diff --git a/simpleclient-archive/simpleclient_log4j2/version-rules.xml b/simpleclient-archive/simpleclient_log4j2/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/simpleclient_log4j2/version-rules.xml +++ b/simpleclient-archive/simpleclient_log4j2/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/simpleclient_logback/pom.xml b/simpleclient-archive/simpleclient_logback/pom.xml index 944b90e97..415ea5e24 100644 --- a/simpleclient-archive/simpleclient_logback/pom.xml +++ b/simpleclient-archive/simpleclient_logback/pom.xml @@ -1,32 +1,32 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_logback - bundle + simpleclient_logback + bundle - Prometheus Java Simpleclient logback - - Metrics collector for logback appender logging - + Prometheus Java Simpleclient logback + + Metrics collector for logback appender logging + - - - io.prometheus - simpleclient - ${project.version} - - - ch.qos.logback - logback-classic - 1.2.11 - - + + + io.prometheus + simpleclient + ${project.version} + + + ch.qos.logback + logback-classic + 1.2.11 + + diff --git a/simpleclient-archive/simpleclient_logback/version-rules.xml b/simpleclient-archive/simpleclient_logback/version-rules.xml index fcb275534..2cd86fb7b 100644 --- a/simpleclient-archive/simpleclient_logback/version-rules.xml +++ b/simpleclient-archive/simpleclient_logback/version-rules.xml @@ -1,11 +1,11 @@ - - - - .*alpha.* - - - + + + + .*alpha.* + + + diff --git a/simpleclient-archive/simpleclient_servlet/pom.xml b/simpleclient-archive/simpleclient_servlet/pom.xml index 74bed6bc5..46c559b48 100644 --- a/simpleclient-archive/simpleclient_servlet/pom.xml +++ b/simpleclient-archive/simpleclient_servlet/pom.xml @@ -1,54 +1,55 @@ - - 4.0.0 + + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_servlet - bundle + simpleclient_servlet + bundle - Prometheus Java Simpleclient Servlet - Javax - - HTTP servlet exporter for the simpleclient. - + Prometheus Java Simpleclient Servlet - Javax + + HTTP servlet exporter for the simpleclient. + - - UTF-8 - + + UTF-8 + - - - io.prometheus - simpleclient - ${project.version} - - - io.prometheus - simpleclient_common - ${project.version} - - - io.prometheus - simpleclient_servlet_common - ${project.version} - - - javax.servlet - javax.servlet-api - 4.0.1 - provided - - - - org.eclipse.jetty - jetty-servlet - 8.2.0.v20160908 - test - - + + + io.prometheus + simpleclient + ${project.version} + + + io.prometheus + simpleclient_common + ${project.version} + + + io.prometheus + simpleclient_servlet_common + ${project.version} + + + javax.servlet + javax.servlet-api + 4.0.1 + provided + + + + org.eclipse.jetty + jetty-servlet + 8.2.0.v20160908 + test + + diff --git a/simpleclient-archive/simpleclient_servlet/version-rules.xml b/simpleclient-archive/simpleclient_servlet/version-rules.xml index 318e865f5..850a3fccc 100644 --- a/simpleclient-archive/simpleclient_servlet/version-rules.xml +++ b/simpleclient-archive/simpleclient_servlet/version-rules.xml @@ -1,12 +1,12 @@ - - - - - [^8].* - - - + + + + + [^8].* + + + diff --git a/simpleclient-archive/simpleclient_servlet_common/pom.xml b/simpleclient-archive/simpleclient_servlet_common/pom.xml index ddfd0d444..f50d5a8a3 100644 --- a/simpleclient-archive/simpleclient_servlet_common/pom.xml +++ b/simpleclient-archive/simpleclient_servlet_common/pom.xml @@ -1,35 +1,36 @@ - - 4.0.0 + + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_servlet_common - bundle + simpleclient_servlet_common + bundle - Prometheus Java Simpleclient Servlet - Common - - HTTP servlet exporter for the simpleclient. - + Prometheus Java Simpleclient Servlet - Common + + HTTP servlet exporter for the simpleclient. + - - UTF-8 - + + UTF-8 + - - - io.prometheus - simpleclient - ${project.version} - - - io.prometheus - simpleclient_common - ${project.version} - - + + + io.prometheus + simpleclient + ${project.version} + + + io.prometheus + simpleclient_common + ${project.version} + + diff --git a/simpleclient-archive/simpleclient_servlet_common/version-rules.xml b/simpleclient-archive/simpleclient_servlet_common/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/simpleclient_servlet_common/version-rules.xml +++ b/simpleclient-archive/simpleclient_servlet_common/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/simpleclient_servlet_jakarta/pom.xml b/simpleclient-archive/simpleclient_servlet_jakarta/pom.xml index 2efa8e00f..e82941a38 100644 --- a/simpleclient-archive/simpleclient_servlet_jakarta/pom.xml +++ b/simpleclient-archive/simpleclient_servlet_jakarta/pom.xml @@ -1,53 +1,54 @@ - - 4.0.0 + + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_servlet_jakarta - bundle + simpleclient_servlet_jakarta + bundle - Prometheus Java Simpleclient Servlet - Jakarta - - HTTP jakarta servlet exporter for the simpleclient. - + Prometheus Java Simpleclient Servlet - Jakarta + + HTTP jakarta servlet exporter for the simpleclient. + - - UTF-8 - + + UTF-8 + - - - io.prometheus - simpleclient - ${project.version} - - - io.prometheus - simpleclient_common - ${project.version} - - - io.prometheus - simpleclient_servlet_common - ${project.version} - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - provided - - - - org.eclipse.jetty - jetty-servlet - 11.0.9 - test - - + + + io.prometheus + simpleclient + ${project.version} + + + io.prometheus + simpleclient_common + ${project.version} + + + io.prometheus + simpleclient_servlet_common + ${project.version} + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + provided + + + + org.eclipse.jetty + jetty-servlet + 11.0.9 + test + + diff --git a/simpleclient-archive/simpleclient_servlet_jakarta/version-rules.xml b/simpleclient-archive/simpleclient_servlet_jakarta/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/simpleclient_servlet_jakarta/version-rules.xml +++ b/simpleclient-archive/simpleclient_servlet_jakarta/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/simpleclient-archive/simpleclient_spring_web/pom.xml b/simpleclient-archive/simpleclient_spring_web/pom.xml index 08e4c15b5..3bfc03a11 100644 --- a/simpleclient-archive/simpleclient_spring_web/pom.xml +++ b/simpleclient-archive/simpleclient_spring_web/pom.xml @@ -1,68 +1,69 @@ - - 4.0.0 + + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_spring_web - bundle + simpleclient_spring_web + bundle - Prometheus Java Simpleclient Spring Metrics - - Spring-specific metrics helpers - + Prometheus Java Simpleclient Spring Metrics + + Spring-specific metrics helpers + - - UTF-8 - + + UTF-8 + - - - io.prometheus - simpleclient - ${project.version} - - - io.prometheus - simpleclient_common - ${project.version} - - - org.springframework - spring-web - 4.3.30.RELEASE - - - org.springframework - spring-aop - 4.3.30.RELEASE - - - org.springframework - spring-context - 4.3.30.RELEASE - - - org.aspectj - aspectjweaver - 1.9.9.1 - - - org.apache.commons - commons-lang3 - 3.12.0 - + + + io.prometheus + simpleclient + ${project.version} + + + io.prometheus + simpleclient_common + ${project.version} + + + org.springframework + spring-web + 4.3.30.RELEASE + + + org.springframework + spring-aop + 4.3.30.RELEASE + + + org.springframework + spring-context + 4.3.30.RELEASE + + + org.aspectj + aspectjweaver + 1.9.9.1 + + + org.apache.commons + commons-lang3 + 3.12.0 + - - - org.springframework - spring-test - 4.3.30.RELEASE - test - - + + + org.springframework + spring-test + 4.3.30.RELEASE + test + + diff --git a/simpleclient-archive/simpleclient_spring_web/version-rules.xml b/simpleclient-archive/simpleclient_spring_web/version-rules.xml index 75c79360f..056c9c580 100644 --- a/simpleclient-archive/simpleclient_spring_web/version-rules.xml +++ b/simpleclient-archive/simpleclient_spring_web/version-rules.xml @@ -1,12 +1,12 @@ - - - - - [^4].* - - - + + + + + [^4].* + + + diff --git a/simpleclient-archive/simpleclient_vertx/pom.xml b/simpleclient-archive/simpleclient_vertx/pom.xml index 81891ab20..e8442d36a 100644 --- a/simpleclient-archive/simpleclient_vertx/pom.xml +++ b/simpleclient-archive/simpleclient_vertx/pom.xml @@ -1,41 +1,42 @@ - - 4.0.0 + + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_vertx - bundle + simpleclient_vertx + bundle - Prometheus Java Simpleclient Vert.x 3 - - Vert.x 3 Web Handler exporter for the simpleclient. - + Prometheus Java Simpleclient Vert.x 3 + + Vert.x 3 Web Handler exporter for the simpleclient. + - - UTF-8 - + + UTF-8 + - - - io.prometheus - simpleclient - ${project.version} - - - io.prometheus - simpleclient_common - ${project.version} - - - io.vertx - vertx-web - 3.9.13 - provided - - + + + io.prometheus + simpleclient + ${project.version} + + + io.prometheus + simpleclient_common + ${project.version} + + + io.vertx + vertx-web + 3.9.13 + provided + + diff --git a/simpleclient-archive/simpleclient_vertx/version-rules.xml b/simpleclient-archive/simpleclient_vertx/version-rules.xml index 582c4ce11..fe1ce92e5 100644 --- a/simpleclient-archive/simpleclient_vertx/version-rules.xml +++ b/simpleclient-archive/simpleclient_vertx/version-rules.xml @@ -1,12 +1,12 @@ - - - - - [^3].* - - - + + + + + [^3].* + + + diff --git a/simpleclient-archive/simpleclient_vertx4/pom.xml b/simpleclient-archive/simpleclient_vertx4/pom.xml index 77ca5bb55..0cc06340e 100644 --- a/simpleclient-archive/simpleclient_vertx4/pom.xml +++ b/simpleclient-archive/simpleclient_vertx4/pom.xml @@ -1,41 +1,42 @@ - - 4.0.0 + + 4.0.0 - - io.prometheus - client_java - 1.0.0-beta-2-SNAPSHOT - + + io.prometheus + client_java + 1.0.0-beta-2-SNAPSHOT + - simpleclient_vertx4 - bundle + simpleclient_vertx4 + bundle - Prometheus Java Simpleclient Vert.x 4 - - Vert.x 4 Web Handler exporter for the simpleclient. - + Prometheus Java Simpleclient Vert.x 4 + + Vert.x 4 Web Handler exporter for the simpleclient. + - - UTF-8 - + + UTF-8 + - - - io.prometheus - simpleclient - ${project.version} - - - io.prometheus - simpleclient_common - ${project.version} - - - io.vertx - vertx-web - 4.3.1 - provided - - + + + io.prometheus + simpleclient + ${project.version} + + + io.prometheus + simpleclient_common + ${project.version} + + + io.vertx + vertx-web + 4.3.1 + provided + + diff --git a/simpleclient-archive/simpleclient_vertx4/version-rules.xml b/simpleclient-archive/simpleclient_vertx4/version-rules.xml index 76f8da4fd..dd2063cfd 100644 --- a/simpleclient-archive/simpleclient_vertx4/version-rules.xml +++ b/simpleclient-archive/simpleclient_vertx4/version-rules.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/version-rules.xml b/version-rules.xml index 5c6d39593..dd2063cfd 100644 --- a/version-rules.xml +++ b/version-rules.xml @@ -1,6 +1,6 @@ - - + +