This is an automated email from the ASF dual-hosted git repository. wesm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push: new 6251c7b ARROW-5579: [Java] Revert first attempt at shading flatbuffers which didn't work 6251c7b is described below commit 6251c7bcc14d121cf7fb3694e44b6835cc77bf75 Author: tianchen <niki...@alibaba-inc.com> AuthorDate: Thu Jun 20 10:27:06 2019 -0500 ARROW-5579: [Java] Revert first attempt at shading flatbuffers which didn't work This reverts commit fbd0c717696126ce0f42474c7a2c6cfffddcdff4. Author: tianchen <niki...@alibaba-inc.com> Closes #4625 from tianchen92/ARROW-5579-revert and squashes the following commits: c1b176826 <tianchen> Revert "ARROW-5579: shade flatbuffer dependency" --- java/flight/pom.xml | 3 --- java/format/pom.xml | 20 -------------------- java/vector/pom.xml | 25 ------------------------- 3 files changed, 48 deletions(-) diff --git a/java/flight/pom.xml b/java/flight/pom.xml index 3745207..7d01a6e 100644 --- a/java/flight/pom.xml +++ b/java/flight/pom.xml @@ -185,9 +185,6 @@ <include>com.google.protobuf:*</include> <include>com.google.guava:*</include> </includes> - <excludes> - <exclude>com.google.flatbuffers:*</exclude> - </excludes> </artifactSet> <relocations> <relocation> diff --git a/java/format/pom.xml b/java/format/pom.xml index c6159b3..8997eb1 100644 --- a/java/format/pom.xml +++ b/java/format/pom.xml @@ -159,26 +159,6 @@ <skip>true</skip> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>3.2.1</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <excludes> - <exclude>com.google.flatbuffers:*</exclude> - </excludes> - </artifactSet> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/java/vector/pom.xml b/java/vector/pom.xml index 7f194e3..b882e3e 100644 --- a/java/vector/pom.xml +++ b/java/vector/pom.xml @@ -133,31 +133,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>3.2.1</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <excludes> - <exclude>com.google.flatbuffers:*</exclude> - <exclude>io.netty:*</exclude> - <exclude>com.fasterxml.jackson.core:*</exclude> - <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.apache.arrow:arrow-memory</exclude> - <exclude>org.apache.arrow:arrow-format</exclude> - </excludes> - </artifactSet> - </configuration> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> <plugins>