Commit Graph

1507 Commits

Author SHA1 Message Date
Dale Wijnand 33e3b9f693 Commit build auto-formatting changes for code in master. 2015-05-28 08:28:05 +01:00
Dale Wijnand 7a124bd2df Fix bincompat for project-level excludes in the POM. 2015-05-28 08:15:10 +01:00
Dale Wijnand 4d7184d8c3 Add project-level exclusions in the POM.
Closes #1877.
2015-05-28 08:14:08 +01:00
Josh Suereth 7c888aab38 Merge pull request #2040 from sbt/readme-formatting
Fix intended formatting in README.
2015-05-27 18:45:46 -04:00
Josh Suereth ee04b980ad Merge pull request #2036 from kamilkloch/2028-fork-error
Updated ForkError.getMessage() to include exception's original name.
2015-05-27 18:45:25 -04:00
Josh Suereth d6a829caa4 Merge pull request #2027 from cunei/wip-fix-2001
Do not emit in the pom dependencies that are only sources or docs
2015-05-27 18:43:50 -04:00
Josh Suereth 2adc8b6883 Merge pull request #2025 from PanAeon/panaeon/fix-history
Prevent history command(s) from going into an infinite loop
2015-05-24 13:19:41 -04:00
Dale Wijnand 0b85d2207a Merge pull request #2034 from sbt/fix/2014
Cached resolution: Clean up old dynamic minigraphs. Fixes #2014
2015-05-24 00:48:46 +01:00
Eugene Yokota fa97b0b8d6 Adds null guard 2015-05-23 17:32:56 -04:00
Eugene Yokota d83602e12b Cached resolution: Clean up old dynamic minigraphs. Fixes #2014
Cached resolution saves dynamic mini graphs (including subproject
graphs) timestamped to the logical clock (State).
This enables graph caching across the subprojects.
On the other hand, it creates garbage that becomes stale almost
immediately. Prior to #2030 fix, this garbage would reach 1GB+.
This fix timestamps these graphs using calendar date, and cleans them
up after a day.
2015-05-23 03:25:26 -04:00
Josh Suereth ee43591ae2 Merge pull request #2017 from ajsquared/0.13
Add forceUpdatePeriod
2015-05-22 10:00:41 -04:00
Josh Suereth 8ff95bd855 Merge pull request #2030 from sbt/wip/no-caller
Fixes #1721/#1763. Cached resolution: summarize callers in graph.json
2015-05-22 09:59:27 -04:00
Eugene Yokota e430139680 Fixes #1721/#1763. Cached resolution: summarize callers in graph.json
- On some of the builds graph.json is reaching 250MB+
- JSON parsing alone takes hours
- 97% of the content are caller info
- This change summarizes all callers into one (zero caller would have
correctness issues)
2015-05-21 23:04:52 -04:00
Antonio Cunei 65dc88adc6 Do not emit in the pom dependencies that are only sources or docs
The pom generation code tries its best to map Ivy's configurations
to Maven scopes; however, sources and javadoc artifacts cannot be
properly mapped and they currently are emitted as dependencies in
the default scope (compile). That may lead to the source/doc jars
being erroneously processed like regular jars by automated tools.

Arguably, the source/docs jars should not be included in the pom
file as dependencies at all. This commit filters out the
dependencies that only appear in the sources and/or javadoc Ivy
configurations, thereby preventing them from appearing in the
final pom file.
2015-05-20 03:40:16 +02:00
Josh Suereth ed0423ee59 Merge pull request #1970 from matthewfarwell/test-exclude
Test exclude
2015-05-11 15:27:06 -04:00
David Perez 2f1f42e6de Merge branch '0.13.8' into 0.13 2015-05-08 09:33:40 +02:00
eugene yokota 2212269261 Merge pull request #1996 from sbt/wip/fix-aether-resolver
Fix issue with aether resolver and bad URLs.
2015-05-07 13:06:11 -07:00
eugene yokota e80ed27329 Merge pull request #1992 from dwijnand/cross-scala-versions-default
Fix crossScalaVersions default, derived from scalaVersion. Fixes #1828.
2015-04-29 05:08:40 -07:00
eugene yokota ba681e89e0 Merge pull request #1989 from dwijnand/inThisBuild
Add inThisBuild, similar to inConfig. Fixes #1847
2015-04-26 18:58:12 -07:00
eugene yokota e76479baad Merge pull request #1987 from ajsquared/0.13
Add configurationsToRetrieve
2015-04-26 18:54:32 -07:00
Andrew Johnson 3f871a499d Support configuring a subset of configurations from which to retrieve dependencies when retrieveManaged is true 2015-04-23 12:49:45 -04:00
Josh Suereth 1e901e971b Merge pull request #1964 from sbt/fix/1958
Various workarounds to get Travis CI less flaky
2015-04-20 10:18:15 -04:00
eugene yokota 7081c06a36 Merge pull request #1960 from asflierl/0.13
Honor overwrite flag when publishing locally.
2015-04-14 11:54:10 -07:00
eugene yokota a334c01c57 Merge pull request #1950 from ajsquared/0.13
Add retrieveManagedSync
2015-04-10 12:48:17 -07:00
Andreas Flierl e647412bf6 Honor overwrite flag when publishing locally. 2015-04-10 13:29:26 +02:00
eugene yokota 5a53433d70 Merge pull request #1946 from dwijnand/rename-root-project-to-sbtRoot
Rename root project to sbtRoot.
2015-04-07 14:50:27 -07:00
eugene yokota caf51a0745 Merge pull request #1945 from dwijnand/make-use-of-0.13.8-settings-syntax
Make use of the nicer Project settings syntax in 0.13.8.
2015-04-07 14:49:55 -07:00
Andrew Johnson 983d07bd86 Add constructor with default sync value 2015-04-03 11:33:12 -04:00
Andrew Johnson 31d71c72e2 Fix compilation error in BaseIvySpecification 2015-03-31 13:03:49 -04:00
Andrew Johnson d3246e5915 Add retrieveManagedSync 2015-03-31 10:59:41 -04:00
eugene yokota 6ba2fd60f0 Merge pull request #1944 from sbt/wip/fix-aether-range-query
Wip/fix aether range query
2015-03-27 13:01:19 -07:00
Josh Suereth 07731e68f5 Fix unit test for makepom. 2015-03-27 07:51:37 -04:00
Josh Suereth 7f80872171 Fixes #1921.
* Add version range query (if needed) before resolving artifact in Aether.
* Ensure detected version is used after having a version range query.
2015-03-26 16:09:29 -04:00
eugene yokota 51e9b57f34 Merge pull request #1942 from ajozwik/patch-1
Updated to 0.13.9-SNAPSHOT
2015-03-26 09:03:56 -07:00
Josh Suereth 25650267be Merge pull request #1938 from sbt/wip/launcher-as-module
Removing launcher in favor of re-wrapping sbt/launcher module
2015-03-26 08:13:46 -04:00
eugene yokota e18d37aed1 Merge pull request #1941 from sbt/wip/1940
Wip/1940
2015-03-25 15:11:58 -07:00
David Perez 3d3a07ae5c Merge remote-tracking branch 'upstream/0.13' into 0.13 2015-03-25 16:12:54 +01:00
David Perez 84386580f2 Merge remote-tracking branch 'origin/0.13.7' into 0.13 2015-03-25 16:01:15 +01:00
Josh Suereth b4d0feb7da Remove jcenter from generated pom.xml files (like maven central is not there). 2015-03-25 10:18:59 -04:00
eugene yokota 77be2c8d1c Merge pull request #1935 from sbt/wip/nine
Merging 0.13.8 and bumping up to 0.13.9-SNAPSHOT
2015-03-25 06:12:46 -07:00
Josh Suereth 7877723d12 Restore component manager test via stubs. 2015-03-25 08:03:09 -04:00
Josh Suereth df959cf0d4 Migrate to using the sbt/launcher module, rather than having the code embedded.
* Remove launch/* code/tests, as these are in the sbt/launcher project.
* Create a new project which will resolve launcher module from sonatype-snapshots,
  and repackage it for the currently building version of sbt.
* Remove ComponentManagerTest which was relying DIRECTLY on launcher classes.
  We'll need to reconfigure this shortly to enable the tests again.

Remaining TODOs -

* Update resolvers so people can find the launcher.
* Add ComponentManagerTest back.
* Re-publish the sbt-launch.jar in the location it used to be published.
2015-03-24 16:12:51 -04:00
eugene yokota 2c236de02a Merge pull request #1922 from dwijnand/removable
Add -= & --= for settings & tasks, dual of += & ++=.
2015-03-23 22:13:11 -07:00
eugene yokota d73de0305f Merge pull request #1934 from MaxWorgan/0.13
Fixes #1834, `<developers>` section is not rendered correctly in the pom.xml
2015-03-23 12:06:26 -07:00
Max Worgan a50fcab1f8 Inserted brackets to developer xml renders correctly 2015-03-23 14:16:05 +00:00
eugene yokota c0ee4082b9 Merge pull request #1904 from sbt/fix/1763
Use pickler for cached resolution
2015-03-10 08:02:40 -04:00
Eugene Yokota 3afb941ad2 Remove custom picklers
- sbt/serialization supports these
2015-03-09 21:22:58 -04:00
Eugene Yokota 8a0e8ef74e Write JSON to file without String. #1763 2015-03-09 21:22:58 -04:00
Eugene Yokota 936c804c41 Improve caching internal deps. #1763
Some heap optimization during merging too.
YourKit showed that mergeOrganizationArtifactReports takes up huge
amount of heap.
2015-03-09 21:22:58 -04:00
Eugene Yokota b583c031bb OOM handling. #1763 2015-03-09 21:22:58 -04:00