You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bahir.apache.org by lr...@apache.org on 2016/06/24 22:09:11 UTC
[3/3] bahir git commit: [[BAHIR-14] More parent pom cleanup
[[BAHIR-14] More parent pom cleanup
Remove Spark assembly related configuration, and
stop producing source jars for non-jar projects.
Project: http://git-wip-us.apache.org/repos/asf/bahir/repo
Commit: http://git-wip-us.apache.org/repos/asf/bahir/commit/2dfcd08d
Tree: http://git-wip-us.apache.org/repos/asf/bahir/tree/2dfcd08d
Diff: http://git-wip-us.apache.org/repos/asf/bahir/diff/2dfcd08d
Branch: refs/heads/master
Commit: 2dfcd08d11e94b535a39c31c87cf690f99944357
Parents: 5937073
Author: Luciano Resende <lr...@apache.org>
Authored: Fri Jun 24 14:57:50 2016 -0700
Committer: Luciano Resende <lr...@apache.org>
Committed: Fri Jun 24 14:57:50 2016 -0700
----------------------------------------------------------------------
pom.xml | 55 ------------------------------------------
streaming-akka/pom.xml | 6 +++++
streaming-mqtt/pom.xml | 5 ++++
streaming-twitter/pom.xml | 6 +++++
streaming-zeromq/pom.xml | 6 +++++
5 files changed, 23 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bahir/blob/2dfcd08d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 670d897..9488898 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,9 +108,6 @@
<test.java.home>${java.home}</test.java.home>
<test.exclude.tags></test.exclude.tags>
- <!-- Package to use when relocating shaded classes. -->
- <spark.shade.packageName>org.spark_project</spark.shade.packageName>
-
<!-- Modules that copy jars to the build directory should do so under this location. -->
<jars.target.dir>${project.build.directory}/scala-${scala.binary.version}/jars</jars.target.dir>
@@ -688,11 +685,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
@@ -806,53 +798,6 @@
</executions>
</plugin>
- <!--
- The shade plug-in is used here to create effective pom's (see SPARK-3812), and also
- remove references from the shaded libraries from artifacts published by Spark.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <configuration>
- <shadedArtifactAttached>false</shadedArtifactAttached>
- <artifactSet>
- <includes>
- <include>org.spark-project.spark:unused</include>
- <include>org.eclipse.jetty:jetty-io</include>
- <include>org.eclipse.jetty:jetty-http</include>
- <include>org.eclipse.jetty:jetty-continuation</include>
- <include>org.eclipse.jetty:jetty-servlet</include>
- <include>org.eclipse.jetty:jetty-servlets</include>
- <include>org.eclipse.jetty:jetty-plus</include>
- <include>org.eclipse.jetty:jetty-security</include>
- <include>org.eclipse.jetty:jetty-util</include>
- <include>org.eclipse.jetty:jetty-server</include>
- <include>com.google.guava:guava</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.eclipse.jetty</pattern>
- <shadedPattern>${spark.shade.packageName}.jetty</shadedPattern>
- <includes>
- <include>org.eclipse.jetty.**</include>
- </includes>
- </relocation>
- <relocation>
- <pattern>com.google.common</pattern>
- <shadedPattern>${spark.shade.packageName}.guava</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/bahir/blob/2dfcd08d/streaming-akka/pom.xml
----------------------------------------------------------------------
diff --git a/streaming-akka/pom.xml b/streaming-akka/pom.xml
index 2c90993..1dc87e4 100644
--- a/streaming-akka/pom.xml
+++ b/streaming-akka/pom.xml
@@ -66,5 +66,11 @@
<build>
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/bahir/blob/2dfcd08d/streaming-mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/streaming-mqtt/pom.xml b/streaming-mqtt/pom.xml
index e26f0ac..efa62ca 100644
--- a/streaming-mqtt/pom.xml
+++ b/streaming-mqtt/pom.xml
@@ -74,6 +74,11 @@
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+
<!-- Assemble a jar with test dependencies for Python tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/bahir/blob/2dfcd08d/streaming-twitter/pom.xml
----------------------------------------------------------------------
diff --git a/streaming-twitter/pom.xml b/streaming-twitter/pom.xml
index c2daa77..72de5aa 100644
--- a/streaming-twitter/pom.xml
+++ b/streaming-twitter/pom.xml
@@ -66,5 +66,11 @@
<build>
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/bahir/blob/2dfcd08d/streaming-zeromq/pom.xml
----------------------------------------------------------------------
diff --git a/streaming-zeromq/pom.xml b/streaming-zeromq/pom.xml
index d6994ef..aca7d23 100644
--- a/streaming-zeromq/pom.xml
+++ b/streaming-zeromq/pom.xml
@@ -70,5 +70,11 @@
<build>
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
</project>