diff --git a/cli/pom.xml b/cli/pom.xml
index 36417f5..3300442 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -311,10 +311,28 @@
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <filters>
                                 <filter>
+                                    <artifact>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml</artifact>
                                     <excludes>
+                                        <exclude>META-INF/services/com.fasterxml.jackson.core.ObjectCodec</exclude>
+                                        <exclude>META-INF/services/com.fasterxml.jackson.core.JsonFactory</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>licenses/*.*</exclude>
+                                        <exclude>module-info.class</exclude>
                                         <exclude>META-INF/*.SF</exclude>
                                         <exclude>META-INF/*.DSA</exclude>
                                         <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>META-INF/DEPENDENCIES</exclude>
+                                        <exclude>META-INF/LICENSE</exclude>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                        <exclude>META-INF/NOTICE</exclude>
+                                        <exclude>META-INF/maven/**/pom.xml</exclude>
+                                        <exclude>META-INF/maven/**/pom.properties</exclude>
+                                        <exclude>META-INF/native/**/*.*</exclude>
+                                        <exclude>META-INF/versions/9/module-info.class</exclude>
                                     </excludes>
                                 </filter>
                             </filters>
diff --git a/cli/scripts/update-picocli.sh b/cli/scripts/update-picocli.sh
index 30735fb..5a6517c 100755
--- a/cli/scripts/update-picocli.sh
+++ b/cli/scripts/update-picocli.sh
@@ -17,7 +17,7 @@ VERSION=$(curl -sI https://github.com/remkop/picocli/releases/latest | grep -i l
 DIR="$( cd "$( dirname "$( dirname "${BASH_SOURCE[0]}" )")" && pwd )"
 BASE_URL="https://raw.githubusercontent.com/remkop/picocli"
 LICENSE_URL="$BASE_URL/v$VERSION/LICENSE"
-LICENSE_FILE_PATH="$DIR/src/main/resources/META-INF/picocli/LICENSE"
+LICENSE_FILE_PATH="$DIR/src/main/resources/META-INF/licenses/picocli.txt"
 RELATIVE_SOURCE_FILE_PATH="src/main/java/picocli/CommandLine.java"
 SOURCE_URL="$BASE_URL/v$VERSION/$RELATIVE_SOURCE_FILE_PATH"
 SOURCE_FILE_PATH="$DIR/$RELATIVE_SOURCE_FILE_PATH"
diff --git a/cli/src/main/resources/META-INF/picocli/LICENSE b/cli/src/main/resources/META-INF/licenses/picocli.txt
similarity index 100%
rename from cli/src/main/resources/META-INF/picocli/LICENSE
rename to cli/src/main/resources/META-INF/licenses/picocli.txt