diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0cb648bd6070..b4c1f25194a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,7 +109,7 @@ jobs: # Run only integration tests to verify JDBC driver shading run: | export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}" - $MAVEN failsafe:integration-test -B --strict-checksums -P ci -pl :trino-jdbc + $MAVEN failsafe:integration-test failsafe:verify -B --strict-checksums -P ci -pl :trino-jdbc - name: Clean Maven Output run: $MAVEN clean -pl '!:trino-server,!:trino-cli' - uses: docker/setup-qemu-action@v2 diff --git a/client/trino-jdbc/pom.xml b/client/trino-jdbc/pom.xml index 5abf674f99ca..94662eb910c7 100644 --- a/client/trino-jdbc/pom.xml +++ b/client/trino-jdbc/pom.xml @@ -350,6 +350,10 @@ io.airlift ${shadeBase}.airlift + + javax.annotation + ${shadeBase}.javax.annotation + jakarta.annotation ${shadeBase}.jakarta.annotation @@ -389,12 +393,13 @@ org/intellij/** META-INF/maven/** META-INF/services/com.fasterxml.** - META-INF/proguard/okhttp3.pro - META-INF/proguard/okio.pro + META-INF/proguard/** LICENSE META-INF/**.kotlin_module META-INF/versions/** META-INF/NOTICE** + META-INF/*-NOTICE + META-INF/*-LICENSE META-INF/LICENSE** diff --git a/service/trino-verifier/pom.xml b/service/trino-verifier/pom.xml index 10b2b12075c1..c91462f926d6 100644 --- a/service/trino-verifier/pom.xml +++ b/service/trino-verifier/pom.xml @@ -73,6 +73,12 @@ jackson-core + + com.google.code.findbugs + jsr305 + true + + com.google.guava guava