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

Updated the shade configuration, so it creates jars that can be used for #481

Merged
merged 9 commits into from
Mar 9, 2019
Merged

Updated the shade configuration, so it creates jars that can be used for #481

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb31a5c
Updated the shade configuration, so it creates jars that can be used for
hallvard Mar 7, 2019
d7edd8e
Merge branch 'master' into modular-shade
hallvard Mar 7, 2019
06fe344
Removed includes, as provided dependencies are excluded.
hallvard Mar 7, 2019
bd65a63
Changed dependency on file format modules to provided to help shade
hallvard Mar 7, 2019
fc3a785
Merge branch 'master' into modular-shade
hallvard Mar 7, 2019
dce2026
Removed core's dependency on commons-lang3, since (the need for) it was
hallvard Mar 7, 2019
7e867e4
commons-lang3 no longer included in core, so must be included in shaded
hallvard Mar 7, 2019
7613986
Try without the includes, it should work when core is provided.
hallvard Mar 8, 2019
d9b139c
Fixed indentation.
hallvard Mar 8, 2019
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
24 changes: 24 additions & 0 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,30 @@
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
<artifactSet>
<excludes>
Copy link
Collaborator

@benmccann benmccann Mar 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if we make the dependencies on the reader projects provided and optional?

I'd just include a comment explaining why we did it so that it's not accidentally removed later:

<scope>provided</scope> <!-- because the shade plugin doesn't exclude optional dependencies -->

<exclude>tech.tablesaw:tablesaw-excel</exclude>
<exclude>org.apache.poi:*</exclude>
<exclude>commons-codec:commons-codec</exclude>
<exclude>org.apache.commons:commons-collections4</exclude>
<exclude>org.apache.xmlbeans:xmlbeans</exclude>
<exclude>org.apache.commons:commons-compress</exclude>
<exclude>com.github.virtuald:curvesapi</exclude>

<exclude>tech.tablesaw:tablesaw-html</exclude>
<exclude>org.jsoup:jsoup</exclude>

<exclude>tech.tablesaw:tablesaw-json</exclude>
<exclude>com.fasterxml.jackson.core:*</exclude>
<exclude>com.github.wnameless:json-flattener</exclude>
<exclude>com.eclipsesource.minimal-json:minimal-json</exclude>

<exclude>tech.tablesaw:tablesaw-smile</exclude>
<exclude>com.github.haifengl:smile-data</exclude>
<exclude>org.apache.commons:commons-text</exclude>
<exclude>com.github.haifengl:smile-math</exclude>
</excludes>
</artifactSet>
</configuration>
<executions>
<execution>
Expand Down
19 changes: 19 additions & 0 deletions excel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,25 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move all the common configuration under pluginManagement in the parent pom?

<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down
19 changes: 19 additions & 0 deletions html/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,25 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down
19 changes: 19 additions & 0 deletions json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,25 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down
26 changes: 26 additions & 0 deletions jsplot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,32 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
<artifactSet>
<includes>
<include>io.pebbletemplates:pebble</include>
<include>com.coverity.security:coverity-escapers</include>
<include>org.slf4j:slf4j-api</include>
</includes>
</artifactSet>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
<dependencies>
Expand Down
31 changes: 31 additions & 0 deletions smile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,37 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
<artifactSet>
<includes>
<include>tech.tablesaw:tablesaw-smile</include>
<include>com.github.haifengl:smile-data</include>
<include>com.github.haifengl:smile-math</include>
<include>org.apache.commons:commons-text</include>
<!-- included in core
<include>org.apache.commons:commons-lang3</include>
benmccann marked this conversation as resolved.
Show resolved Hide resolved
<include>org.slf4j:slf4j-api</include>
-->
</includes>
</artifactSet>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down