Skip to content

Commit

Permalink
Merge branch 'main' into add-caffeine-guava-instrumentation-to-bom
Browse files Browse the repository at this point in the history
  • Loading branch information
zeitlinger authored Nov 4, 2024
2 parents 49ad96d + 05c6862 commit 02f92af
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.20.2</version>
<version>1.20.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<automatic.module.name>--module-name-need-to-be-overriden--</automatic.module.name>
<junit-jupiter.version>5.11.2</junit-jupiter.version>
<otel.instrumentation.version>2.8.0-alpha</otel.instrumentation.version>
<junit-jupiter.version>5.11.3</junit-jupiter.version>
<otel.instrumentation.version>2.9.0-alpha</otel.instrumentation.version>
<java.version>8</java.version>
<jacoco.line-coverage>0.70</jacoco.line-coverage>
<coverage.skip>false</coverage.skip>
Expand Down Expand Up @@ -152,7 +152,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Expand All @@ -168,7 +168,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.20.0</version>
<version>3.21.0</version>
</plugin>
<!-- Plugins with groupId org.apache.maven.plugins that are not part of default bindings. -->
<plugin>
Expand All @@ -177,15 +177,15 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.8.0</version>
<version>3.8.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.1</version>
</plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down Expand Up @@ -332,7 +332,7 @@
<path>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.33.0</version>
<version>2.35.1</version>
</path>
<!-- Other annotation processors go here.
Expand All @@ -358,7 +358,7 @@
<plugin>
<!-- maven-site-plugin 3.3 requires maven-project-info-reports-plugin < 3.0 -->
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.7.0</version>
<version>3.8.0</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion prometheus-metrics-exporter-opentelemetry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>3.9.1</version>
<version>3.9.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
4 changes: 2 additions & 2 deletions prometheus-metrics-exposition-formats/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<properties>
<automatic.module.name>io.prometheus.metrics.expositionformats</automatic.module.name>
<protobuf-java.version>4.28.2</protobuf-java.version>
<protobuf-java.version>4.28.3</protobuf-java.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -90,7 +90,7 @@
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<version>3.4.1</version>
<version>3.5.0</version>
<executions>
<execution>
<id>Generate Protobuf</id>
Expand Down

0 comments on commit 02f92af

Please sign in to comment.