Skip to content

Commit

Permalink
Revert "Resolve conflicting transitive dependencies"
Browse files Browse the repository at this point in the history
This reverts commit 48ad419.
  • Loading branch information
benalexau committed Aug 4, 2021
1 parent 53b5eb5 commit 0122cc9
Showing 1 changed file with 20 additions and 4 deletions.
24 changes: 20 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,21 @@
<artifactId>h2-mvstore</artifactId>
<version>1.4.200</version>
</dependency>
<dependency>
<groupId>io.github.microutils</groupId>
<artifactId>kotlin-logging</artifactId>
<version>1.7.10</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.openhft</groupId>
<artifactId>chronicle-bytes</artifactId>
Expand Down Expand Up @@ -199,6 +214,10 @@
<groupId>io.github.microutils</groupId>
<artifactId>kotlin-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-common</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -256,10 +275,6 @@
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections-forkjoin</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -315,6 +330,7 @@
<usedDependency>org.fusesource.leveldbjni:leveldbjni-linux64</usedDependency>
<usedDependency>org.lwjgl:lwjgl</usedDependency>
<usedDependency>org.lwjgl:lwjgl-lmdb</usedDependency>
<usedDependency>io.github.microutils:kotlin-logging</usedDependency>
<usedDependency>net.openhft:chronicle-core</usedDependency>
<usedDependency>net.openhft:chronicle-bytes</usedDependency>
<usedDependency>net.openhft:chronicle-threads</usedDependency>
Expand Down

0 comments on commit 0122cc9

Please sign in to comment.