Exclude commons-lang3 lib from Cassandra dependency in ScalarDB and S…

…calarDL tests (#134)
scalar-labs · Jan 14, 2025 · 95feb42 · 95feb42
1 parent 3cff45b
commit 95feb42
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -20,6 +20,11 @@ jobs:
         java-version: '11'
         distribution: 'temurin'
 
+    - name: Install leiningen
+      uses: DeLaGuardo/[email protected]
+      with:
+        lein: latest
+
     - name: Cache m2 repository
       uses: actions/cache@v3
       with:

diff --git a/scalardb/project.clj b/scalardb/project.clj
@@ -7,7 +7,7 @@
                  [net.java.dev.jna/jna "5.11.0"]
                  [net.java.dev.jna/jna-platform "5.11.0"]
                  [org.slf4j/slf4j-jdk14 "2.0.6"]
-                 [cassandra "0.1.0-SNAPSHOT"]
+                 [cassandra "0.1.0-SNAPSHOT" :exclusions [org.apache.commons/commons-lang3]]
                  [cheshire "5.12.0"]
                  [com.scalar-labs/scalardb-schema-loader "4.0.0-SNAPSHOT"]]
   :repositories {"sonartype" "https://oss.sonatype.org/content/repositories/snapshots/"}
@@ -21,7 +21,7 @@
                                                          io.grpc/grpc-core
                                                          com.scalar-labs/scalardb-rpc]]]}
              :use-jars {:dependencies [[com.google.guava/guava "31.1-jre"]
-                                       [org.apache.commons/commons-text "1.10.0"]]
+                                       [org.apache.commons/commons-text "1.13.0"]]
                         :resource-paths ["resources/scalardb.jar"]}
              :default [:base :system :user :provided :dev :use-released]}
   :jvm-opts ["-Djava.awt.headless=true"]

diff --git a/scalardl/project.clj b/scalardl/project.clj
@@ -9,7 +9,7 @@
                  [net.java.dev.jna/jna "5.11.0"]
                  [net.java.dev.jna/jna-platform "5.11.0"]
                  [org.slf4j/slf4j-jdk14 "2.0.6"]
-                 [cassandra "0.1.0-SNAPSHOT"]
+                 [cassandra "0.1.0-SNAPSHOT" :exclusions [org.apache.commons/commons-lang3]]
                  [cc.qbits/alia "4.3.6"]
                  [cc.qbits/hayt "4.1.0"]]
   :repositories {"sonartype" "https://oss.sonatype.org/content/repositories/snapshots/"}