vagrant-omnibus 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbae26bb2578c8365aa975504631802baa655471
-  data.tar.gz: 3135aa853c1dd0b902cf1a18bc4b4bcd3b224436
+  metadata.gz: e325f5bc0c626e1edba6c5068b1034d3bdc3dc85
+  data.tar.gz: 9fb90e995737bd3360c2fe286b233d97c98395a7
 SHA512:
-  metadata.gz: bc51cfb50ab270b05b899f93cae8cc624fc4723f857beff4d348cdc089144fc2ea4df2b1b175892c08e4937db66f31a50e2ebdcc436e69043284b242ce289c02
-  data.tar.gz: 0989b2ad1530a5a5a3346129f7d05a3b14707eb5fc623180063f1f186f5d2f66d101ccaf12036270261b716883d8281805813a33a00fea9b0393e240e1fdf952
+  metadata.gz: 573694d4f627168a27ef72043d78ae046df1a3ccbc7ed19ab2926b8776e17e27ce4dda6d54ddfc9ee8497efed250fbd4a7c182da1cc288aa3abaa68599307b56
+  data.tar.gz: 8a0b491252755e1628c255ed67893abd602c70ae12ae926aa8f31c7d530d14a74f2727b1d82ef328d6ce9066efc03b884d709f0fd54fe419fcefc8b6dde96783

data/.gitignore

@@ -1,19 +1,19 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-bin/
-.vagrant/
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+bin/
+.vagrant/

data/.rspec

@@ -1 +1 @@
---default_path test/unit
+--default-path test/unit

data/.travis.yml

@@ -1,8 +1,18 @@
-rvm:
-  - 2.0.0
-  - 2.1.0
-
-bundler_args: --jobs 7 --without=acceptance
-
-script:
-  - bundle exec rake travis:ci
+rvm:
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
+
+branches:
+  only:
+    - master
+
+before_install:
+  - rvm @global do gem uninstall bundler --all --executables
+  - gem uninstall bundler --all --executables
+  - gem install bundler --version '1.12.5'
+
+bundler_args: --jobs 7 --without=acceptance
+
+script:
+  - bundle exec rake travis:ci

data/.yardopts

@@ -1,7 +1,7 @@
---markup=markdown
---markup-provider=redcarpet
---readme=README.md
--
-CHANGELOG.md
-LICENSE
-TODO.md
+--markup=markdown
+--markup-provider=redcarpet
+--readme=README.md
+-
+CHANGELOG.md
+LICENSE
+TODO.md

data/CHANGELOG.md

@@ -1,196 +1,98 @@
-vagrant-omnibus Changelog
-=========================
-This file is used to list changes made in each version of the vagrant-omnibus plugin.
-
-1.4.1 (April 26, 2014)
-----------------------
-### Bug Fixes
-
-- Issue [#79][]: Install command not idempotent on Windows. ([@schisamo][])
-
-1.4.0 (April 25, 2014)
--------------------------
-### New Features
-
-- PR [#73][]: Full caching of omnibus package downloads! Huge thanks to [@tknerr][] for all all his Herculean effort coordinating this fix in [vagrant-cachier/#13](https://github.com/fgrehm/vagrant-cachier/issues/13) and [opscode-omnitruck/#3](https://github.com/opscode/opscode-omnitruck/pull/33).
-
-### Bug Fixes
-
-- PR [#67][]: No-op validation if `config.omnibus.chef_version` is `nil`. ([@skv-headless][])
-
-1.3.1 (March 12, 2014)
-----------------------
-### Improvements
-
-- PR [#66][]: Run install.sh with `sh` rather than `bash`. ([@tknerr][])
-
-### Bug Fixes
-
-- PR [#65][]: Make unlinking the install.sh reliably work on windows hosts. ([@tknerr][])
-- Issue [#69][]: Ensure all remote commands are executed with `sh`. ([@schisamo][])
-
-1.3.0 (February 24, 2014)
--------------------------
-### New Features
-
-- PR [#59][], PR [#60][]: Windows guest support! ([@jarig][])([@schisamo][])
-
-### Improvements
-
-- PR [#61][]: Make detection of currently installed Chef version more robust. ([@ampedandwired][])
-- Create explicit tasks for supported provider acceptance tests. ([@schisamo][])
-- Add Ruby 2.1.0 to the Travis CI test matrix. ([@schisamo][])
-
-### Bug Fixes
-
-- Issue [#13][]: Perform config validation at action execution time. ([@schisamo][])
-
-1.2.1 (December 17, 2013)
--------------------------
-### Improvements
-
-- Acceptance test coverage that verifies Chef is not reinstalled into a system where the desired version of Chef already exists. ([@schisamo][])
-
-### Bug Fixes
-
-- PR [#57][]: Filter `stdin is not a tty` when querying installed Chef version. ([@scalp42][])
-
-1.2.0 (December 17, 2013)
--------------------------
-### New Features
-
-- PR [#52][]: Change plugin name to correspond to gem name. ([@tmatilai][])
-
-### Improvements
-
-- PR [#48][]: Don't install Chef if `--no-provision` is specified. ([@tmatilai][])
-- PR [#50][]: Update README.md with vagrant-parallels compatibility. ([@wizonesolutions][])
-- PR [#56][]: Add Rubocop support and fix style errors. ([@schisamo][])
-
-### Bug Fixes
-
-- Issue [#12][]: Ensure plugin is no-op on Windows guests. ([@schisamo][])
-- PR [#53][]: Ensure installed version check works on all platforms. ([@comutt][])
-
-1.1.2 (October 17, 2013)
-------------------------
-### Improvements
-
-- PR [#41][]: Add vagrant-digitalocean to the list of supported providers. ([@tmatilai][])
-- PR [#45][]: Compatibility with vagrant-aws v0.4.0 ([@tmatilai][])
-- Use Vagrant's built in `Vagrant::Util::Downloader` class; removes requirement of the
-  guest OS having `wget` or `curl` installed. ([@schisamo][])
-
-### Bug Fixes
-
-- PR [#43][]: Fix development dependencies and Travis tests. ([@tmatilai][])
-- Issue [#33][] Split fetching of `install.sh` from the actual execution ([@schisamo][])
-
-1.1.1 (September 4, 2013)
--------------------------
-### Bug Fixes
-
-- PR [#28][]: Include OpenStack provider into the list of working providers. ([@srenatus][])
-- PR [#32][], Issue [#31][]: No need to do sudo in sudo ([@matsu911][])
-- PR [#32][], Issue [#32][]: Fix the curl line to install the requested Chef version ([@tmatilai][])
-- PR [#37][]: Document that newer than v1.1.x Vagrant is fine, too. ([@tmatilai][])
-- PR [#38][]: Drop unneeded ConfigValidate action call ([@tmatilai][])
-- Issue [#27][]: Properly shell escape version strings ([@schisamo][])
-
-1.1.0 (June 21, 2013)
----------------------
-### New Features
-
-- PR [#23][], Issue [#17][], Issue [#19][], Issue [#21][], Issue [#23][]: Support for all Vagrant providers that hook into `Vagrant::Action::Builtin::Provision` for provisioning. ([@smdahlen][], [@michfield][], [@rjocoleman][])
-- Issue [#15][]: Multi-VM Vagrantfiles are now fully supported. A global `omnibus.chef_version` will install the same version of Chef on all VMs OR declare a separate Chef version in the config block for each individual VM! ([@smdahlen][], [@schisamo][])
-- PR [#10][]: Optionally change the location of `install.sh` via the `OMNIBUS_INSTALL_URL` environment variable. Default is still https://www.opscode.com/chef/install.sh. , ([@petecheslock][])
-
-1.0.2 (April 20, 2013)
-----------------------
-### Improvements
-
-- Unit test coverage for `VagrantPlugins::Omnibus::Config` ([@schisamo][])
-- Add Rackspace provider acceptance test. ([@schisamo][])
-- Parameterize the acceptance test Rake task, this allows you test run acceptance tests against a single provider. ([@schisamo][])
-
-### Bug Fixes
-
-- Issue [#2][]: Convert `Gem::Version` returned by `#retrieve_latest_chef_version` to a string. ([@schisamo][])
-- Issue [#6][]: RubyGems 2.0 compat: use #empty? to check for results. ([@schisamo][])
-- Issue [#7][]: Ensure 'vagrant-rackspace/action' is loaded. ([@schisamo][])
-- Issue [#8][]: Trigger plugin if machine state is `:active`. ([@schisamo][])
-
-1.0.1 (April 17, 2013)
-----------------------
-### Improvements
-
-- Issue [#2][]: Resolve `latest` to a real Chef version. This ensures the plugin does not attempt to re-install Chef on subsequent provisions. ([@schisamo][])
-- Issue [#4][]: Validate user provided value for omnibus.chef_version is in fact a real Chef version. ([@schisamo][])
-- Retrieve omnibus.chef_version directly from global config. ([@schisamo][])
-- Update development dependencies to vagrant (1.2.1) and vagrant-aws (0.2.1). ([@schisamo][])
-
-### Bug Fixes
-
-- Issue [#3][]: Plugin now correctly operates in "no-op" node if now `omnibus.chef_version` is not present in the Vagrantfile. ([@schisamo][])
-- Use Ubuntu 12.04 release AMI for acceptance testing. ([@schisamo][])
-
-1.0.0 (April 1, 2013)
----------------------
-
-- The initial release.
-
-<!--- The following link definition list is generated by PimpMyChangelog --->
-[#2]: https://github.com/schisamo/vagrant-omnibus/issues/2
-[#3]: https://github.com/schisamo/vagrant-omnibus/issues/3
-[#4]: https://github.com/schisamo/vagrant-omnibus/issues/4
-[#6]: https://github.com/schisamo/vagrant-omnibus/issues/6
-[#7]: https://github.com/schisamo/vagrant-omnibus/issues/7
-[#8]: https://github.com/schisamo/vagrant-omnibus/issues/8
-[#10]: https://github.com/schisamo/vagrant-omnibus/issues/10
-[#12]: https://github.com/schisamo/vagrant-omnibus/issues/12
-[#13]: https://github.com/schisamo/vagrant-omnibus/issues/13
-[#15]: https://github.com/schisamo/vagrant-omnibus/issues/15
-[#17]: https://github.com/schisamo/vagrant-omnibus/issues/17
-[#19]: https://github.com/schisamo/vagrant-omnibus/issues/19
-[#21]: https://github.com/schisamo/vagrant-omnibus/issues/21
-[#23]: https://github.com/schisamo/vagrant-omnibus/issues/23
-[#27]: https://github.com/schisamo/vagrant-omnibus/issues/27
-[#28]: https://github.com/schisamo/vagrant-omnibus/issues/28
-[#31]: https://github.com/schisamo/vagrant-omnibus/issues/31
-[#32]: https://github.com/schisamo/vagrant-omnibus/issues/32
-[#33]: https://github.com/schisamo/vagrant-omnibus/issues/33
-[#37]: https://github.com/schisamo/vagrant-omnibus/issues/37
-[#38]: https://github.com/schisamo/vagrant-omnibus/issues/38
-[#41]: https://github.com/schisamo/vagrant-omnibus/issues/41
-[#43]: https://github.com/schisamo/vagrant-omnibus/issues/43
-[#45]: https://github.com/schisamo/vagrant-omnibus/issues/45
-[#48]: https://github.com/schisamo/vagrant-omnibus/issues/48
-[#50]: https://github.com/schisamo/vagrant-omnibus/issues/50
-[#52]: https://github.com/schisamo/vagrant-omnibus/issues/52
-[#53]: https://github.com/schisamo/vagrant-omnibus/issues/53
-[#56]: https://github.com/schisamo/vagrant-omnibus/issues/56
-[#57]: https://github.com/schisamo/vagrant-omnibus/issues/57
-[#59]: https://github.com/schisamo/vagrant-omnibus/issues/59
-[#60]: https://github.com/schisamo/vagrant-omnibus/issues/60
-[#61]: https://github.com/schisamo/vagrant-omnibus/issues/61
-[#65]: https://github.com/schisamo/vagrant-omnibus/issues/65
-[#66]: https://github.com/schisamo/vagrant-omnibus/issues/66
-[#67]: https://github.com/schisamo/vagrant-omnibus/issues/67
-[#69]: https://github.com/schisamo/vagrant-omnibus/issues/69
-[#73]: https://github.com/schisamo/vagrant-omnibus/issues/73
-[#79]: https://github.com/schisamo/vagrant-omnibus/issues/79
-[@ampedandwired]: https://github.com/ampedandwired
-[@comutt]: https://github.com/comutt
-[@jarig]: https://github.com/jarig
-[@matsu911]: https://github.com/matsu911
-[@michfield]: https://github.com/michfield
-[@petecheslock]: https://github.com/petecheslock
-[@rjocoleman]: https://github.com/rjocoleman
-[@scalp42]: https://github.com/scalp42
-[@schisamo]: https://github.com/schisamo
-[@skv-headless]: https://github.com/skv-headless
-[@smdahlen]: https://github.com/smdahlen
-[@srenatus]: https://github.com/srenatus
-[@tknerr]: https://github.com/tknerr
-[@tmatilai]: https://github.com/tmatilai
-[@wizonesolutions]: https://github.com/wizonesolutions
+# Change Log
+
+## [1.5.0](https://github.com/chef/vagrant-omnibus/tree/1.5.0) (2016-08-31)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.4.1...1.5.0)
+
+**Merged pull requests:**
+
+- Convert specs to rspec 3 format [\#138](https://github.com/chef/vagrant-omnibus/pull/138) ([tas50](https://github.com/tas50))
+- Testing improvements, dep bumps, and fixes [\#137](https://github.com/chef/vagrant-omnibus/pull/137) ([tas50](https://github.com/tas50))
+- Fix installing chef on windows in vagrant 1.8.3 and up [\#135](https://github.com/chef/vagrant-omnibus/pull/135) ([mwrock](https://github.com/mwrock))
+- Fixed Travis CI image and link. [\#115](https://github.com/chef/vagrant-omnibus/pull/115) ([mbrukman](https://github.com/mbrukman))
+- Update README.md to point to current Travis location [\#101](https://github.com/chef/vagrant-omnibus/pull/101) ([petems](https://github.com/petems))
+- Change :latest to not hit rubygems [\#97](https://github.com/chef/vagrant-omnibus/pull/97) ([lamont-granquist](https://github.com/lamont-granquist))
+- README: added info about Windows support [\#94](https://github.com/chef/vagrant-omnibus/pull/94) ([docwhat](https://github.com/docwhat))
+- Fix string to use Ruby variables in tests [\#93](https://github.com/chef/vagrant-omnibus/pull/93) ([petems](https://github.com/petems))
+- Add plugin spec [\#92](https://github.com/chef/vagrant-omnibus/pull/92) ([petems](https://github.com/petems))
+
+## [v1.4.1](https://github.com/chef/vagrant-omnibus/tree/v1.4.1) (2014-04-26)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.4.0...v1.4.1)
+
+## [v1.4.0](https://github.com/chef/vagrant-omnibus/tree/v1.4.0) (2014-04-25)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.3.1...v1.4.0)
+
+**Merged pull requests:**
+
+- Cache omnibus download, expose config options [\#73](https://github.com/chef/vagrant-omnibus/pull/73) ([tknerr](https://github.com/tknerr))
+- Fix not specified chef version without internet connection [\#67](https://github.com/chef/vagrant-omnibus/pull/67) ([skv-headless](https://github.com/skv-headless))
+
+## [v1.3.1](https://github.com/chef/vagrant-omnibus/tree/v1.3.1) (2014-03-12)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.3.0...v1.3.1)
+
+**Merged pull requests:**
+
+- run install.sh with `sh` rather than `bash`... [\#66](https://github.com/chef/vagrant-omnibus/pull/66) ([tknerr](https://github.com/tknerr))
+- make unlinking the install.sh reliably work on windows hosts [\#65](https://github.com/chef/vagrant-omnibus/pull/65) ([tknerr](https://github.com/tknerr))
+
+## [v1.3.0](https://github.com/chef/vagrant-omnibus/tree/v1.3.0) (2014-02-24)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.2.1...v1.3.0)
+
+**Merged pull requests:**
+
+- Make detection of currently installed Chef version more robust [\#61](https://github.com/chef/vagrant-omnibus/pull/61) ([ampedandwired](https://github.com/ampedandwired))
+- Windows Support Part Deux [\#60](https://github.com/chef/vagrant-omnibus/pull/60) ([schisamo](https://github.com/schisamo))
+
+## [v1.2.1](https://github.com/chef/vagrant-omnibus/tree/v1.2.1) (2013-12-18)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.2.0...v1.2.1)
+
+**Merged pull requests:**
+
+- filder 'stdin is not a tty' when trying to figure installed Chef version [\#57](https://github.com/chef/vagrant-omnibus/pull/57) ([scalp42](https://github.com/scalp42))
+
+## [v1.2.0](https://github.com/chef/vagrant-omnibus/tree/v1.2.0) (2013-12-17)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.1.2...v1.2.0)
+
+**Merged pull requests:**
+
+- Ruby linting with Rubocop [\#56](https://github.com/chef/vagrant-omnibus/pull/56) ([schisamo](https://github.com/schisamo))
+- Fix installed version check to be more robust [\#53](https://github.com/chef/vagrant-omnibus/pull/53) ([comutt](https://github.com/comutt))
+- Change plugin name to correspond gem name [\#52](https://github.com/chef/vagrant-omnibus/pull/52) ([tmatilai](https://github.com/tmatilai))
+- Update README.md with vagrant-parallels compatibility [\#50](https://github.com/chef/vagrant-omnibus/pull/50) ([wizonesolutions](https://github.com/wizonesolutions))
+- Don't install Chef if `--no-provision` is specified [\#48](https://github.com/chef/vagrant-omnibus/pull/48) ([tmatilai](https://github.com/tmatilai))
+
+## [v1.1.2](https://github.com/chef/vagrant-omnibus/tree/v1.1.2) (2013-10-17)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.1.1...v1.1.2)
+
+**Merged pull requests:**
+
+- Compatibility with vagrant-aws v0.4.0 [\#45](https://github.com/chef/vagrant-omnibus/pull/45) ([tmatilai](https://github.com/tmatilai))
+- Fix development dependencies and Travis tests [\#43](https://github.com/chef/vagrant-omnibus/pull/43) ([tmatilai](https://github.com/tmatilai))
+- Add vagrant-digitalocean to the list of supported providers [\#41](https://github.com/chef/vagrant-omnibus/pull/41) ([tmatilai](https://github.com/tmatilai))
+
+## [v1.1.1](https://github.com/chef/vagrant-omnibus/tree/v1.1.1) (2013-09-04)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.1.0...v1.1.1)
+
+**Merged pull requests:**
+
+- Document that newer than v1.1.x Vagrant is fine, too [\#37](https://github.com/chef/vagrant-omnibus/pull/37) ([tmatilai](https://github.com/tmatilai))
+- Fix the curl line to install the requested Chef version [\#32](https://github.com/chef/vagrant-omnibus/pull/32) ([tmatilai](https://github.com/tmatilai))
+- no need to do sudo in sudo [\#31](https://github.com/chef/vagrant-omnibus/pull/31) ([matsu911](https://github.com/matsu911))
+- include OpenStack provider into the list of working providers [\#28](https://github.com/chef/vagrant-omnibus/pull/28) ([srenatus](https://github.com/srenatus))
+
+## [v1.1.0](https://github.com/chef/vagrant-omnibus/tree/v1.1.0) (2013-06-21)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.0.2...v1.1.0)
+
+**Merged pull requests:**
+
+- add support for vmware\_fusion [\#17](https://github.com/chef/vagrant-omnibus/pull/17) ([rjocoleman](https://github.com/rjocoleman))
+
+## [v1.0.2](https://github.com/chef/vagrant-omnibus/tree/v1.0.2) (2013-04-20)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.0.1...v1.0.2)
+
+## [v1.0.1](https://github.com/chef/vagrant-omnibus/tree/v1.0.1) (2013-04-18)
+[Full Changelog](https://github.com/chef/vagrant-omnibus/compare/v1.0.0...v1.0.1)
+
+## [v1.0.0](https://github.com/chef/vagrant-omnibus/tree/v1.0.0) (2013-04-02)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -1,23 +1,28 @@
-source 'https://rubygems.org'
-
-gemspec
-
-group :development do
-  # We depend on Vagrant for development, but we don't add it as a
-  # gem dependency because we expect to be installed within the
-  # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.5.4'
-  gem 'vagrant-windows', '~> 1.6.0'
-end
-
-group :acceptance do
-  gem 'vagrant-digitalocean', '~> 0.5'
-  gem 'vagrant-aws', '~> 0.4'
-  gem 'vagrant-rackspace', '~> 0.1'
-end
-
-group :docs do
-  gem 'yard', '~> 0.8'
-  gem 'redcarpet', '~> 2.2'
-  gem 'github-markup', '~> 0.7'
-end
+source "https://rubygems.org"
+
+gemspec
+
+group :development do
+  # We depend on Vagrant for development, but we don't add it as a
+  # gem dependency because we expect to be installed within the
+  # Vagrant environment itself using `vagrant plugin`.
+  gem "vagrant", git: "git://github.com/mitchellh/vagrant.git", tag: "v1.8.4"
+  gem "listen", "~> 3.0.8"
+end
+
+group :acceptance do
+  gem "vagrant-digitalocean", "~> 0.5"
+  gem "vagrant-aws", "~> 0.4"
+  gem "vagrant-rackspace", "~> 0.1"
+end
+
+group :docs do
+  gem "yard", "~> 0.8"
+  gem "redcarpet", "~> 2.2"
+  gem "github-markup", "~> 0.7"
+end
+
+group :changelog do
+  gem "github_changelog_generator"
+  gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.2.2") # allows for Ruby 2.1.9 compatibility
+end

data/LICENSE

@@ -1,201 +1,201 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.