Skip to content

Commit 473263f

Browse files
dongjoon-hyunrxin
authored andcommitted
[SPARK-13834][BUILD] Update sbt and sbt plugins for 2.x.
## What changes were proposed in this pull request? For 2.0.0, we had better make **sbt** and **sbt plugins** up-to-date. This PR checks the status of each plugins and bumps the followings. * sbt: 0.13.9 --> 0.13.11 * sbteclipse-plugin: 2.2.0 --> 4.0.0 * sbt-dependency-graph: 0.7.4 --> 0.8.2 * sbt-mima-plugin: 0.1.6 --> 0.1.9 * sbt-revolver: 0.7.2 --> 0.8.0 All other plugins are up-to-date. (Note that `sbt-avro` seems to be change from 0.3.2 to 1.0.1, but it's not published in the repository.) During upgrade, this PR also updated the following MiMa error. Note that the related excluding filter is already registered correctly. It seems due to the change of MiMa exception result. ``` // SPARK-12896 Send only accumulator updates to driver, not TaskMetrics ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.Accumulable.this"), -ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.Accumulator.this"), +ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.Accumulator.this"), ``` ## How was this patch tested? Pass the Jenkins build. Author: Dongjoon Hyun <[email protected]> Closes apache#11669 from dongjoon-hyun/update_mima.
1 parent f3daa09 commit 473263f

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

dev/mima

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ SPARK_PROFILES="-Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl -Phive-thriftserver -P
4040
generate_mima_ignore "$(build/sbt $SPARK_PROFILES "export assembly/fullClasspath" | tail -n1)"
4141
generate_mima_ignore "$(build/sbt $SPARK_PROFILES "export oldDeps/fullClasspath" | tail -n1)"
4242

43-
echo -e "q\n" | build/sbt mima-report-binary-issues | grep -v -e "info.*Resolving"
43+
echo -e "q\n" | build/sbt mimaReportBinaryIssues | grep -v -e "info.*Resolving"
4444
ret_val=$?
4545

4646
if [ $ret_val != 0 ]; then

project/MimaExcludes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ object MimaExcludes {
192192
) ++ Seq(
193193
// SPARK-12896 Send only accumulator updates to driver, not TaskMetrics
194194
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.Accumulable.this"),
195-
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.Accumulator.this"),
195+
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.Accumulator.this"),
196196
ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.Accumulator.initialValue")
197197
) ++ Seq(
198198
// SPARK-12692 Scala style: Fix the style violation (Space before "," or ":")

project/SparkBuild.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import sbt.Classpaths.publishTask
2626
import sbt.Keys._
2727
import sbtunidoc.Plugin.UnidocKeys.unidocGenjavadocVersion
2828
import com.typesafe.sbt.pom.{PomBuild, SbtPomKeys}
29-
import net.virtualvoid.sbt.graph.Plugin.graphSettings
3029

3130
import spray.revolver.RevolverPlugin._
3231

@@ -144,7 +143,7 @@ object SparkBuild extends PomBuild {
144143
"org.spark-project" %% "genjavadoc-plugin" % unidocGenjavadocVersion.value cross CrossVersion.full),
145144
scalacOptions <+= target.map(t => "-P:genjavadoc:out=" + (t / "java")))
146145

147-
lazy val sharedSettings = graphSettings ++ sparkGenjavadocSettings ++ Seq (
146+
lazy val sharedSettings = sparkGenjavadocSettings ++ Seq (
148147
javaHome := sys.env.get("JAVA_HOME")
149148
.orElse(sys.props.get("java.home").map { p => new File(p).getParentFile().getAbsolutePath() })
150149
.map(file),
@@ -241,7 +240,7 @@ object SparkBuild extends PomBuild {
241240
/* Enable shared settings on all projects */
242241
(allProjects ++ optionallyEnabledProjects ++ assemblyProjects ++ Seq(spark, tools))
243242
.foreach(enable(sharedSettings ++ DependencyOverrides.settings ++
244-
ExcludedDependencies.settings ++ Revolver.settings))
243+
ExcludedDependencies.settings))
245244

246245
/* Enable tests settings for all projects except examples, assembly and tools */
247246
(allProjects ++ optionallyEnabledProjects).foreach(enable(TestSettings.settings))

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17-
sbt.version=0.13.9
17+
sbt.version=0.13.11

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2")
22

3-
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
3+
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
44

55
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
66

7-
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
7+
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
88

99
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
1010

11-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")
11+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.9")
1212

1313
addSbtPlugin("com.alpinenow" % "junit_xml_listener" % "0.5.1")
1414

1515
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3")
1616

1717
addSbtPlugin("com.cavorite" % "sbt-avro" % "0.3.2")
1818

19-
addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
19+
addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
2020

2121
libraryDependencies += "org.ow2.asm" % "asm" % "5.0.3"
2222

0 commit comments

Comments
 (0)