Added slf4j-to-jul to shaded artifact (#94)

ydb-platform · Dec 23, 2024 · 0238a0e · 0238a0e
2 parents 3673ad7 + 3b1b99f
commit 0238a0e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -12,7 +12,7 @@ on:
 jobs:
   prepare:
     name: Prepare Maven cache
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     env:
         MAVEN_ARGS: --batch-mode -Dstyle.color=always
@@ -33,7 +33,7 @@ jobs:
 
   build:
     name: Build JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: prepare
 
     strategy:
@@ -103,7 +103,7 @@ jobs:
   coverage:
     if: github.repository == 'ydb-platform/ydb-jdbc-driver'
     name: Coverage JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
 
     env:

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,7 +11,7 @@ on:
 jobs:
   prepare:
     name: Prepare Maven cache
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     env:
         MAVEN_ARGS: --batch-mode -Dstyle.color=always
@@ -47,7 +47,7 @@ jobs:
 
   build:
     name: YDB JDBC Driver CI on JDK
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: prepare
 
     strategy:

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -8,7 +8,7 @@ on:
 jobs:
   validate:
     name: Validate YDB JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -52,7 +52,7 @@ jobs:
 
   publish:
     name: Publish YDB JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: validate
 
     env:

diff --git a/jdbc-shaded/pom.xml b/jdbc-shaded/pom.xml
@@ -19,6 +19,11 @@
             <groupId>tech.ydb.jdbc</groupId>
             <artifactId>ydb-jdbc-driver</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -117,6 +122,12 @@
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>
+                        <filter>
+                            <artifact>org.slf4j:slf4j-api</artifact>
+                            <excludes>
+                                <exclude>org/slf4j/impl/**</exclude>
+                            </excludes>
+                        </filter>
                     </filters>
 
                     <relocations>