Repository: spark Updated Branches: refs/heads/master 5338772f3 -> d2071e8f4
Revert "[WIP] [SPARK-3996]: Shade Jetty in Spark deliverables" This reverts commit f240fe390b46b6e9859ce74108c5a5fba5c5f8b3. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d2071e8f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d2071e8f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d2071e8f Branch: refs/heads/master Commit: d2071e8f45e74117f78a42770b0c610cb98e5075 Parents: 5338772 Author: Patrick Wendell <[email protected]> Authored: Thu Jan 29 17:14:27 2015 -0800 Committer: Patrick Wendell <[email protected]> Committed: Thu Jan 29 17:14:27 2015 -0800 ---------------------------------------------------------------------- bin/compute-classpath.sh | 4 +--- core/pom.xml | 22 ++-------------------- network/common/pom.xml | 12 ++++++++++++ pom.xml | 32 -------------------------------- 4 files changed, 15 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d2071e8f/bin/compute-classpath.sh ---------------------------------------------------------------------- diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh index a8c344b..9e8d0b7 100755 --- a/bin/compute-classpath.sh +++ b/bin/compute-classpath.sh @@ -50,8 +50,8 @@ fi if [ -n "$SPARK_PREPEND_CLASSES" ]; then echo "NOTE: SPARK_PREPEND_CLASSES is set, placing locally compiled Spark"\ "classes ahead of assembly." >&2 - # Spark classes CLASSPATH="$CLASSPATH:$FWDIR/core/target/scala-$SPARK_SCALA_VERSION/classes" + CLASSPATH="$CLASSPATH:$FWDIR/core/target/jars/*" CLASSPATH="$CLASSPATH:$FWDIR/repl/target/scala-$SPARK_SCALA_VERSION/classes" CLASSPATH="$CLASSPATH:$FWDIR/mllib/target/scala-$SPARK_SCALA_VERSION/classes" CLASSPATH="$CLASSPATH:$FWDIR/bagel/target/scala-$SPARK_SCALA_VERSION/classes" @@ -63,8 +63,6 @@ if [ -n "$SPARK_PREPEND_CLASSES" ]; then CLASSPATH="$CLASSPATH:$FWDIR/sql/hive/target/scala-$SPARK_SCALA_VERSION/classes" CLASSPATH="$CLASSPATH:$FWDIR/sql/hive-thriftserver/target/scala-$SPARK_SCALA_VERSION/classes" CLASSPATH="$CLASSPATH:$FWDIR/yarn/stable/target/scala-$SPARK_SCALA_VERSION/classes" - # Jars for shaded deps in their original form (copied here during build) - CLASSPATH="$CLASSPATH:$FWDIR/core/target/jars/*" fi # Use spark-assembly jar from either RELEASE or assembly directory http://git-wip-us.apache.org/repos/asf/spark/blob/d2071e8f/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index d91f4ee..31e919a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -94,36 +94,23 @@ <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> </dependency> - - <!-- Jetty dependencies promoted to compile here so they are shaded - and inlined into spark-core jar --> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-plus</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <scope>compile</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> @@ -361,24 +348,19 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> - <!-- When using SPARK_PREPEND_CLASSES Spark classes compiled locally don't use - shaded deps. So here we store jars in their original form which are added - when the classpath is computed. --> <execution> <id>copy-dependencies</id> <phase>package</phase> <goals> <goal>copy-dependencies</goal> </goals> - <configuration> + <configuration> <outputDirectory>${project.build.directory}</outputDirectory> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>false</overWriteSnapshots> <overWriteIfNewer>true</overWriteIfNewer> <useSubDirectoryPerType>true</useSubDirectoryPerType> - <includeArtifactIds> - guava,jetty-io,jetty-http,jetty-plus,jetty-util,jetty-server - </includeArtifactIds> + <includeArtifactIds>guava</includeArtifactIds> <silent>true</silent> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/spark/blob/d2071e8f/network/common/pom.xml ---------------------------------------------------------------------- diff --git a/network/common/pom.xml b/network/common/pom.xml index 8f7c924..5a9bbe1 100644 --- a/network/common/pom.xml +++ b/network/common/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/spark/blob/d2071e8f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 63c0a2a..4adfdf3 100644 --- a/pom.xml +++ b/pom.xml @@ -337,39 +337,25 @@ </exclusion> </exclusions> </dependency> - - <!-- Shaded deps marked as provided. These are promoted to compile scope - in the modules where we want the shaded classes to appear in the - associated jar. --> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>${jetty.version}</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> <version>${jetty.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> <version>${jetty.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-plus</artifactId> <version>${jetty.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jetty.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -377,8 +363,6 @@ <version>14.0.1</version> <scope>provided</scope> </dependency> - <!-- End of shaded deps --> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -1292,27 +1276,11 @@ <shadedArtifactAttached>false</shadedArtifactAttached> <artifactSet> <includes> - <!-- At a minimum we must include this to force effective pom generation --> <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-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>org.spark-project.jetty</shadedPattern> - <includes> - <include>org.eclipse.jetty.**</include> - </includes> - </relocation> - <relocation> <pattern>com.google.common</pattern> <shadedPattern>org.spark-project.guava</shadedPattern> <excludes> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
