Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move opencsv to be non-shaded #2903

Merged
merged 2 commits into from
Jun 8, 2022
Merged

Move opencsv to be non-shaded #2903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f10c9b
Specify opencsv as a dependency rather than shading it in
nvoxland Jun 2, 2022
c84b7fa
Specify opencsv as a dependency rather than shading it in
nvoxland Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions liquibase-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@
<artifactId>opencsv</artifactId>
<version>5.6</version>
</dependency>


</dependencies>

<build>
Expand Down Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions liquibase-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,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>
Expand Down
17 changes: 15 additions & 2 deletions liquibase-dist/src/main/assembly/assembly-bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down
7 changes: 6 additions & 1 deletion liquibase-dist/src/main/maven/release.pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>