Skip to content
Open
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 core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<dependency>
<groupId>at.yawk.lz4</groupId>
<artifactId>lz4-java</artifactId>
<version>1.10.3</version>
<version>1.11.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
18 changes: 12 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ under the License.
<version.flatbuffers>24.3.25</version.flatbuffers>
<version.hadoop>3.5.0</version.hadoop>
<version.log4j>2.26.1</version.log4j>
<version.opentelemetry>1.60.1</version.opentelemetry>
<version.opentelemetry>1.65.0</version.opentelemetry>
<version.slf4j>2.0.17</version.slf4j>
<version.thrift>0.23.0</version.thrift>
<version.zookeeper>3.9.5</version.zookeeper>
Expand All @@ -190,15 +190,15 @@ under the License.
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-bom</artifactId>
<version>1.14.5</version>
<version>1.16.7</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<!-- for dependency convergence between Micrometer and ZooKeeper -->
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.104.Final</version>
<version>4.1.130.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -278,7 +278,7 @@ under the License.
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>3.2.0</version>
<version>3.2.4</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
Expand Down Expand Up @@ -361,12 +361,12 @@ under the License.
<groupId>io.opentelemetry.javaagent</groupId>
<artifactId>opentelemetry-javaagent</artifactId>
<!-- This version was selected because it aligns with the version of open telemetry that Accumulo is using. -->
<version>2.26.1</version>
<version>2.31.1</version>
</dependency>
<dependency>
<groupId>io.opentelemetry.proto</groupId>
<artifactId>opentelemetry-proto</artifactId>
<version>1.9.0-alpha</version>
<version>1.11.0-alpha</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
Expand Down Expand Up @@ -649,6 +649,12 @@ under the License.
<artifactId>jline</artifactId>
<version>3.25.1</version>
</dependency>
<dependency>
<!-- for dependency convergence between Micrometer and Caffeine -->
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
<version>1.0.1</version>
</dependency>
Comment on lines +652 to +657

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this do?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are asking why I added this: Caffeine depends on 1.0.0 and Micrometer depends on 1.0.1. By specifying the version here, we don't end up with two different jars on the classpath. I'm assuming that 1.0.1 is fine for Caffeine as it's a bugfix version by naming convention.

If you are asking what jspecify does, I don't know, I didn't look it up.

<dependency>
<groupId>org.latencyutils</groupId>
<artifactId>LatencyUtils</artifactId>
Expand Down