diff options
Diffstat (limited to 'network')
| -rw-r--r-- | network/common/pom.xml | 24 | ||||
| -rw-r--r-- | network/shuffle/pom.xml | 1 |
2 files changed, 18 insertions, 7 deletions
diff --git a/network/common/pom.xml b/network/common/pom.xml index 245a96b8c4..5a9bbe105d 100644 --- a/network/common/pom.xml +++ b/network/common/pom.xml @@ -48,10 +48,15 @@ <artifactId>slf4j-api</artifactId> <scope>provided</scope> </dependency> + <!-- + Promote Guava to "compile" so that maven-shade-plugin picks it up (for packaging the Optional + class exposed in the Java API). The plugin will then remove this dependency from the published + pom, so that Guava does not pollute the client's compilation classpath. + --> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <scope>provided</scope> + <scope>compile</scope> </dependency> <!-- Test dependencies --> @@ -88,11 +93,6 @@ <version>2.2</version> <executions> <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - <execution> <id>test-jar-on-test-compile</id> <phase>test-compile</phase> <goals> @@ -101,6 +101,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <configuration> + <shadedArtifactAttached>false</shadedArtifactAttached> + <artifactSet> + <includes> + <include>com.google.guava:guava</include> + </includes> + </artifactSet> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/network/shuffle/pom.xml b/network/shuffle/pom.xml index 5bfa1ac9c3..c2d0300ecd 100644 --- a/network/shuffle/pom.xml +++ b/network/shuffle/pom.xml @@ -52,7 +52,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <scope>provided</scope> </dependency> <!-- Test dependencies --> |