Merge pull request #2903 from liquibase/remove-shading

Move opencsv to be non-shaded
liquibase · Jun 8, 2022 · b3249c3 · b3249c3
2 parents d31a2fe + c84b7fa
commit b3249c3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 54 deletions.
diff --git a/liquibase-core/pom.xml b/liquibase-core/pom.xml
@@ -113,8 +113,6 @@
             <artifactId>opencsv</artifactId>
             <version>5.6</version>
         </dependency>
-
-
     </dependencies>
 
     <build>
@@ -234,48 +232,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>com.opencsv:*</include>
-                                    <include>org.apache.commons:commons-lang3</include>
-                                    <include>org.apache.commons:commons-text</include>
-                                    <include>org.apache.commons:commons-collections4</include>
-                                </includes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>org.apache.commons.collections4</pattern>
-                                    <shadedPattern>liquibase.repackaged.org.apache.commons.collections4</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons.lang3</pattern>
-                                    <shadedPattern>liquibase.repackaged.org.apache.commons.lang3</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons.text</pattern>
-                                    <shadedPattern>liquibase.repackaged.org.apache.commons.text</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.opencsv</pattern>
-                                    <shadedPattern>liquibase.repackaged.com.opencsv</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/liquibase-dist/pom.xml b/liquibase-dist/pom.xml
@@ -118,13 +118,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- required for firebird driver -->
-        <dependency>
-            <groupId>javax.resource</groupId>
-            <artifactId>connector-api</artifactId>
-            <version>1.5</version>
-        </dependency>
-
         <!-- needed for inclusion in CLI when running in newer java versions -->
 
         <dependency>

diff --git a/liquibase-dist/src/main/assembly/assembly-bin.xml b/liquibase-dist/src/main/assembly/assembly-bin.xml
@@ -96,7 +96,10 @@
         <dependencySet>
             <outputFileNameMapping> ${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <outputDirectory>internal/lib</outputDirectory>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <scope>runtime</scope>
             <includes>
+                <include>com.opencsv:opencsv:</include>
                 <include>org.yaml:snakeyaml:jar:</include>
                 <include>javax.xml.bind:jaxb-api:jar:</include>
                 <include>org.glassfish.jaxb:jaxb-runtime:jar:</include>
@@ -112,12 +115,22 @@
                 <include>org.xerial:sqlite-jdbc:jar:</include>
                 <include>com.ibm.db2:jcc:jar:</include>
                 <include>org.firebirdsql.jdbc:jaybird:</include>
-                <include>javax.resource:connector-api:</include>
 
                 <!-- CANNOT SHIP FOR LICENSE REASONS -->
                 <!-- <include>mysql:mysql-connector-java:jar</include>-->
-
             </includes>
+
+            <!-- some libraries lie about compile vs. runtime dependencies. Or we don't hit code that uses these. So exclude them manually. -->
+            <excludes>
+                <exclude>org.antlr:antlr4-runtime:jar:</exclude>  <!-- from connector-api -->
+                <exclude>org.checkerframework:checker-qual:jar:</exclude> <!-- from postgresql -->
+                <exclude>commons-beanutils:commons-beanutils:jar:</exclude> <!-- from opencsv -->
+                <exclude>org.glassfish.jaxb:txw2:jar:</exclude> <!-- from jaxb-core -->
+                <exclude>com.sun.istack:istack-commons-runtime:jar:</exclude> <!-- from jaxb-core -->
+                <exclude>jakarta.xml.bind:jakarta.xml.bind-api:jar:</exclude> <!-- from jaxb-runtime -->
+                <exclude>com.sun.activation:jakarta.activation:jar:</exclude> <!-- from jaxb-runtime -->
+                <exclude>javax.activation:javax.activation-api:jar:</exclude> <!-- from jaxb-api -->
+            </excludes>
         </dependencySet>
     </dependencySets>
 

diff --git a/liquibase-dist/src/main/maven/release.pom.xml b/liquibase-dist/src/main/maven/release.pom.xml
@@ -41,7 +41,12 @@
             <artifactId>snakeyaml</artifactId>
             <version>1.27</version>
             <scope>compile</scope>
-            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>5.6</version>
         </dependency>
     </dependencies>
 </project>