Skip to content

[SPARK-13324] [CORE] [BUILD] Update plugin, test, example dependencies for 2.x #11206

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

Closed
srowen wants to merge 4 commits into from
Closed

[SPARK-13324] [CORE] [BUILD] Update plugin, test, example dependencies for 2.x #11206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9224468
Phase 1: update plugin versions, test dependencies, some example and …
srowen Feb 15, 2016
bee3d61
Back off Selenium to avoid Jetty version problem
srowen Feb 15, 2016
cb01590
Resolve scalatest / scalacheck incompatibility
srowen Feb 16, 2016
5498896
Require Maven 3.3.9 in build
srowen Feb 17, 2016
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
2 changes: 1 addition & 1 deletion build/mvn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ install_app() {

# Install maven under the build/ folder
install_mvn() {
local MVN_VERSION="3.3.3"
local MVN_VERSION="3.3.9"
Copy link
Contributor

@JoshRosen JoshRosen Feb 17, 2016

Choose a reason for hiding this comment

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

If we're going to bump Maven, should we also make sure that we have an enforcer rule which doesn't allow any earlier version of Maven to be used?

Copy link
Member Author

@srowen srowen Feb 17, 2016

Choose a reason for hiding this comment

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

It's already in the enforcer rule, but oops, I did not update the expected Maven version in the parent POM. Coming now ...


install_app \
"http://archive.apache.org/dist/maven/maven-3/${MVN_VERSION}/binaries" \
Expand Down
8 changes: 4 additions & 4 deletions dev/deps/spark-deps-hadoop-2.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ javax.servlet-api-3.0.1.jar
javolution-5.5.1.jar
jaxb-api-2.2.2.jar
jaxb-impl-2.2.3-1.jar
jcl-over-slf4j-1.7.10.jar
jcl-over-slf4j-1.7.16.jar
jdo-api-3.0.1.jar
jersey-client-1.9.jar
jersey-core-1.9.jar
Expand All @@ -121,7 +121,7 @@ json4s-jackson_2.11-3.2.10.jar
jsr305-1.3.9.jar
jta-1.1.jar
jtransforms-2.4.0.jar
jul-to-slf4j-1.7.10.jar
jul-to-slf4j-1.7.16.jar
kryo-2.21.jar
leveldbjni-all-1.8.jar
libfb303-0.9.2.jar
Expand Down Expand Up @@ -164,8 +164,8 @@ scala-reflect-2.11.7.jar
scala-xml_2.11-1.0.2.jar
scalap-2.11.7.jar
servlet-api-2.5.jar
slf4j-api-1.7.10.jar
slf4j-log4j12-1.7.10.jar
slf4j-api-1.7.16.jar
slf4j-log4j12-1.7.16.jar
snappy-0.2.jar
snappy-java-1.1.2.jar
spire-macros_2.11-0.7.4.jar
Expand Down
8 changes: 4 additions & 4 deletions dev/deps/spark-deps-hadoop-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ javax.servlet-3.0.0.v201112011016.jar
javolution-5.5.1.jar
jaxb-api-2.2.2.jar
jaxb-impl-2.2.3-1.jar
jcl-over-slf4j-1.7.10.jar
jcl-over-slf4j-1.7.16.jar
jdo-api-3.0.1.jar
jersey-core-1.9.jar
jersey-guice-1.9.jar
Expand All @@ -112,7 +112,7 @@ json4s-jackson_2.11-3.2.10.jar
jsr305-1.3.9.jar
jta-1.1.jar
jtransforms-2.4.0.jar
jul-to-slf4j-1.7.10.jar
jul-to-slf4j-1.7.16.jar
kryo-2.21.jar
leveldbjni-all-1.8.jar
libfb303-0.9.2.jar
Expand Down Expand Up @@ -155,8 +155,8 @@ scala-reflect-2.11.7.jar
scala-xml_2.11-1.0.2.jar
scalap-2.11.7.jar
servlet-api-2.5.jar
slf4j-api-1.7.10.jar
slf4j-log4j12-1.7.10.jar
slf4j-api-1.7.16.jar
slf4j-log4j12-1.7.16.jar
snappy-0.2.jar
snappy-java-1.1.2.jar
spire-macros_2.11-0.7.4.jar
Expand Down
8 changes: 4 additions & 4 deletions dev/deps/spark-deps-hadoop-2.4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ javax.servlet-3.0.0.v201112011016.jar
javolution-5.5.1.jar
jaxb-api-2.2.2.jar
jaxb-impl-2.2.3-1.jar
jcl-over-slf4j-1.7.10.jar
jcl-over-slf4j-1.7.16.jar
jdo-api-3.0.1.jar
jersey-client-1.9.jar
jersey-core-1.9.jar
Expand All @@ -113,7 +113,7 @@ json4s-jackson_2.11-3.2.10.jar
jsr305-1.3.9.jar
jta-1.1.jar
jtransforms-2.4.0.jar
jul-to-slf4j-1.7.10.jar
jul-to-slf4j-1.7.16.jar
kryo-2.21.jar
leveldbjni-all-1.8.jar
libfb303-0.9.2.jar
Expand Down Expand Up @@ -156,8 +156,8 @@ scala-reflect-2.11.7.jar
scala-xml_2.11-1.0.2.jar
scalap-2.11.7.jar
servlet-api-2.5.jar
slf4j-api-1.7.10.jar
slf4j-log4j12-1.7.10.jar
slf4j-api-1.7.16.jar
slf4j-log4j12-1.7.16.jar
snappy-0.2.jar
snappy-java-1.1.2.jar
spire-macros_2.11-0.7.4.jar
Expand Down
8 changes: 4 additions & 4 deletions dev/deps/spark-deps-hadoop-2.6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ javax.servlet-3.0.0.v201112011016.jar
javolution-5.5.1.jar
jaxb-api-2.2.2.jar
jaxb-impl-2.2.3-1.jar
jcl-over-slf4j-1.7.10.jar
jcl-over-slf4j-1.7.16.jar
jdo-api-3.0.1.jar
jersey-client-1.9.jar
jersey-core-1.9.jar
Expand All @@ -119,7 +119,7 @@ json4s-jackson_2.11-3.2.10.jar
jsr305-1.3.9.jar
jta-1.1.jar
jtransforms-2.4.0.jar
jul-to-slf4j-1.7.10.jar
jul-to-slf4j-1.7.16.jar
kryo-2.21.jar
leveldbjni-all-1.8.jar
libfb303-0.9.2.jar
Expand Down Expand Up @@ -162,8 +162,8 @@ scala-reflect-2.11.7.jar
scala-xml_2.11-1.0.2.jar
scalap-2.11.7.jar
servlet-api-2.5.jar
slf4j-api-1.7.10.jar
slf4j-log4j12-1.7.10.jar
slf4j-api-1.7.16.jar
slf4j-log4j12-1.7.16.jar
snappy-0.2.jar
snappy-java-1.1.2.jar
spire-macros_2.11-0.7.4.jar
Expand Down
8 changes: 4 additions & 4 deletions dev/deps/spark-deps-hadoop-2.7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ javax.servlet-3.0.0.v201112011016.jar
javolution-5.5.1.jar
jaxb-api-2.2.2.jar
jaxb-impl-2.2.3-1.jar
jcl-over-slf4j-1.7.10.jar
jcl-over-slf4j-1.7.16.jar
jdo-api-3.0.1.jar
jersey-client-1.9.jar
jersey-core-1.9.jar
Expand All @@ -120,7 +120,7 @@ jsp-api-2.1.jar
jsr305-1.3.9.jar
jta-1.1.jar
jtransforms-2.4.0.jar
jul-to-slf4j-1.7.10.jar
jul-to-slf4j-1.7.16.jar
kryo-2.21.jar
leveldbjni-all-1.8.jar
libfb303-0.9.2.jar
Expand Down Expand Up @@ -163,8 +163,8 @@ scala-reflect-2.11.7.jar
scala-xml_2.11-1.0.2.jar
scalap-2.11.7.jar
servlet-api-2.5.jar
slf4j-api-1.7.10.jar
slf4j-log4j12-1.7.10.jar
slf4j-api-1.7.16.jar
slf4j-log4j12-1.7.16.jar
snappy-0.2.jar
snappy-java-1.1.2.jar
spire-macros_2.11-0.7.4.jar
Expand Down
2 changes: 1 addition & 1 deletion docs/building-spark.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ redirect_from: "building-with-maven.html"
* This will become a table of contents (this text will be scraped).
{:toc}

Building Spark using Maven requires Maven 3.3.3 or newer and Java 7+.
Building Spark using Maven requires Maven 3.3.9 or newer and Java 7+.
The Spark build can supply a suitable Maven binary; see below.

# Building with `build/mvn`
Expand Down
6 changes: 3 additions & 3 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>algebird-core_${scala.binary.version}</artifactId>
<version>0.9.0</version>
<version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
Expand All @@ -259,7 +259,7 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
<version>1.2.6</version>
<version>1.2.19</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -318,7 +318,7 @@
<dependency>
<groupId>com.github.scopt</groupId>
<artifactId>scopt_${scala.binary.version}</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
</dependency>

<!--
Expand Down
34 changes: 17 additions & 17 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,16 @@
<akka.group>com.typesafe.akka</akka.group>
<akka.version>2.3.11</akka.version>
<java.version>1.7</java.version>
<maven.version>3.3.3</maven.version>
<maven.version>3.3.9</maven.version>
<sbt.project.name>spark</sbt.project.name>
<mesos.version>0.21.1</mesos.version>
<mesos.classifier>shaded-protobuf</mesos.classifier>
<slf4j.version>1.7.10</slf4j.version>
<slf4j.version>1.7.16</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<hadoop.version>2.2.0</hadoop.version>
<protobuf.version>2.5.0</protobuf.version>
<yarn.version>${hadoop.version}</yarn.version>
<hbase.version>0.98.7-hadoop2</hbase.version>
<hbase.version>0.98.17-hadoop2</hbase.version>
<hbase.artifact>hbase</hbase.artifact>
<flume.version>1.6.0</flume.version>
<zookeeper.version>3.4.5</zookeeper.version>
Expand Down Expand Up @@ -424,7 +424,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>2.42.2</version>
<version>2.45.0</version> <!-- 2.46.0+ requires Jetty 9 -->
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -679,25 +679,25 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
<version>2.2.1</version>
<version>2.2.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.binary.version}</artifactId>
<version>1.11.3</version>
<version>1.12.5</version> <!-- 1.13.0 appears incompatible with scalatest 2.2.6 -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -722,7 +722,7 @@
<groupId>com.spotify</groupId>
<artifactId>docker-client</artifactId>
<classifier>shaded</classifier>
<version>3.2.1</version>
<version>3.4.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -750,13 +750,13 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.34</version>
<version>5.1.38</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.3-1102-jdbc41</version>
<version>9.4.1207.jre7</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -1820,7 +1820,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<version>1.10</version>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
Expand Down Expand Up @@ -1883,7 +1883,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.5.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand All @@ -1904,7 +1904,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<version>2.19.1</version>
<!-- Note config is repeated in scalatest config -->
<configuration>
<includes>
Expand Down Expand Up @@ -2017,7 +2017,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
<version>3.0.0</version>
<configuration>
<filesets>
<fileset>
Expand Down Expand Up @@ -2045,12 +2045,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.5</version>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version>
<version>2.4.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down