Repository navigation
[Don't Merge] upgrade sbt 1.9.8 #44516
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.
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
Closed
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
279d4d1
Upgrad sbt 1.9.8
panbingkun 0c5492c
Merge branch 'master' into sbt_1_9_8
panbingkun f94eed3
trigger appveyor
panbingkun 677afec
fix appveyor python
panbingkun ba53b96
fix PYSPARK_PYTHON
panbingkun 4df8967
install python
panbingkun 480b714
debug appveyor
panbingkun 5def5a7
debug appveyor
panbingkun c13fc6f
debug appveyor
panbingkun 3213a1b
update appveyor
panbingkun ef1285a
upgrade sbt 1.9.8
panbingkun 9d7c8fb
Merge branch 'master' into sbt_1_9_8
panbingkun 5aa6290
update resolvers
panbingkun 4159105
update resolvers
panbingkun 88549d3
Upgrade sbt to 1.9.8
panbingkun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -264,16 +264,14 @@ object SparkBuild extends PomBuild { | |
| .map(file), | ||
| publishMavenStyle := true, | ||
| unidocGenjavadocVersion := "0.18", | ||
|
|
||
| // Override SBT's default resolvers: | ||
| resolvers := Seq( | ||
| // Google Mirror of Maven Central, placed first so that it's used instead of flaky Maven Central. | ||
| // See https://storage-download.googleapis.com/maven-central/index.html for more info. | ||
| "gcs-maven-central-mirror" at "https://maven-central.storage-download.googleapis.com/maven2/", | ||
| DefaultMavenRepository, | ||
| Resolver.mavenLocal, | ||
| Resolver.file("ivyLocal", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns) | ||
| ), | ||
| DefaultMavenRepository) ++ | ||
| { if (sys.env.contains("SKIP_LOCAL_M2")) Nil else Seq(Resolver.mavenLocal) } :+ | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Main modification points. |
||
| Resolver.file("ivyLocal", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns), | ||
| externalResolvers := resolvers.value, | ||
| otherResolvers := SbtPomKeys.mvnLocalRepository(dotM2 => Seq(Resolver.file("dotM2", dotM2))).value, | ||
| (MavenCompile / publishLocalConfiguration) := PublishConfiguration() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only for
Linters, licenses, dependencies and documentation generation