diff --git a/.github/renovate.json5 b/.github/renovate.json5 index d8cb8e634..3b6beecd9 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,6 +1,6 @@ { $schema: "https://docs.renovatebot.com/renovate-schema.json", - extends: ["config:recommended"], + extends: ["config:best-practices", "config:recommended"], platformCommit: "enabled", automerge: true, ignorePaths: [ @@ -8,4 +8,5 @@ // agent resources packages an OTel API that is the minimum required API version "**/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml", ], + labels: ["dependencies"], } diff --git a/.github/workflows/test-release-build.yml b/.github/workflows/test-release-build.yml index 78ee73332..f1aa44073 100644 --- a/.github/workflows/test-release-build.yml +++ b/.github/workflows/test-release-build.yml @@ -25,4 +25,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run the Maven verify phase - run: mise run build-release + run: ./scripts/build-release.sh + env: + # don't ues the current snapshot version, to test a more realistic release + TAG: ${{ github.run_number }} diff --git a/pom.xml b/pom.xml index 509cc12e4..334f4dc7e 100644 --- a/pom.xml +++ b/pom.xml @@ -69,50 +69,6 @@ 3.0.2 provided - - - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit-jupiter.version} - test - - - org.mockito - mockito-core - 5.18.0 - test - - - org.assertj - assertj-core - 3.27.3 - test - - - com.google.guava - guava - ${guava.version} - test - - - org.slf4j - slf4j-simple - 2.0.17 - test - - - org.junit-pioneer - junit-pioneer - 2.3.0 - test - @@ -387,8 +343,84 @@ pom import + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom-alpha + ${otel.instrumentation.version} + pom + import + + + io.opentelemetry + opentelemetry-proto + 1.7.1-alpha + test + + + + + org.junit.jupiter + junit-jupiter + ${junit-jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit-jupiter.version} + test + + + org.mockito + mockito-core + 5.18.0 + test + + + org.assertj + assertj-core + 3.27.3 + test + + + com.google.guava + guava + ${guava.version} + test + + + org.slf4j + slf4j-simple + 2.0.17 + test + + + org.junit-pioneer + junit-pioneer + 2.3.0 + test + + + org.awaitility + awaitility + 4.3.0 + test + + + org.wiremock + wiremock + 3.13.1 + test + + + org.hamcrest + hamcrest-core + + + + javadoc diff --git a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml index 2b5c67da4..1abee8d6c 100644 --- a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml +++ b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml @@ -68,39 +68,37 @@ io.opentelemetry.instrumentation opentelemetry-resources - - - - org.wiremock - wiremock - 3.13.1 - test - - - org.hamcrest - hamcrest-core - - - - - org.awaitility - awaitility - 4.3.0 - test - - - io.opentelemetry - opentelemetry-proto - 1.7.1-alpha - test - - - io.opentelemetry - opentelemetry-sdk-testing - test - + + + + javadoc + + + release + + + default + + true + + + + + io.opentelemetry + opentelemetry-proto + test + + + io.opentelemetry + opentelemetry-sdk-testing + test + + + + + @@ -127,7 +125,7 @@ ../prometheus-metrics-exporter-opentelemetry/src/main - + diff --git a/prometheus-metrics-exporter-opentelemetry/pom.xml b/prometheus-metrics-exporter-opentelemetry/pom.xml index 3d4d5c2f3..30eece5ae 100644 --- a/prometheus-metrics-exporter-opentelemetry/pom.xml +++ b/prometheus-metrics-exporter-opentelemetry/pom.xml @@ -69,39 +69,37 @@ io.opentelemetry.instrumentation opentelemetry-resources - - - - org.wiremock - wiremock - 3.13.1 - test - - - org.hamcrest - hamcrest-core - - - - - org.awaitility - awaitility - 4.3.0 - test - - - io.opentelemetry - opentelemetry-proto - 1.7.1-alpha - test - - - io.opentelemetry - opentelemetry-sdk-testing - test - + + + + javadoc + + + release + + + default + + true + + + + + io.opentelemetry + opentelemetry-proto + test + + + io.opentelemetry + opentelemetry-sdk-testing + test + + + + + diff --git a/prometheus-metrics-exposition-formats-shaded/pom.xml b/prometheus-metrics-exposition-formats-shaded/pom.xml index 1d64a2ad8..178dbebe4 100644 --- a/prometheus-metrics-exposition-formats-shaded/pom.xml +++ b/prometheus-metrics-exposition-formats-shaded/pom.xml @@ -33,15 +33,34 @@ protobuf-java ${protobuf-java.version} - - io.prometheus - prometheus-metrics-exposition-textformats - ${project.version} - test - test-jar - + + + + javadoc + + + release + + + default + + true + + + + + io.prometheus + prometheus-metrics-exposition-textformats + ${project.version} + test + test-jar + + + + +