diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-12-14 13:16:00 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2016-12-14 13:16:00 +0000 |
| commit | 3d6708ec441be10a8d4807dbf170de3656213dbb (patch) | |
| tree | 4fa3e8d4ca4eb22bf191b4075d33694e6d305d99 /integration/LICENSE.txt | |
| parent | 9a60bf31008014670e3ad9b4def49688a91672ff (diff) | |
| download | hamcrest-3d6708ec441be10a8d4807dbf170de3656213dbb.tar.gz | |
Remove hamcrest-integration
This target is not used and the module does not exist in
Hamcrest 2.0. In Hamcrest 2.0 the file it contains has been
merged into the hamcrest-core module, which is represented in
Android by the hamcrest/hamcrest-host/hamcrest-hostdex build
targets.
Similarly, in Hamcrest 2.0 the TypeSafeMatcher class is in the
hamcrest-core module and not the hamcrest-library module.
This moves the two classes into the appropriate module in
preparation for upgrading JUnit to 4.12 and Hamcrest to 2.0.
Bug: 33613916
Bug: 30946317
Test: make checkbuild
Change-Id: Ib22cf3dce1180b3df12764093b727ff2482c51e5
Diffstat (limited to 'integration/LICENSE.txt')
| -rw-r--r-- | integration/LICENSE.txt | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/integration/LICENSE.txt b/integration/LICENSE.txt deleted file mode 100644 index 5ebe92c..0000000 --- a/integration/LICENSE.txt +++ /dev/null @@ -1,27 +0,0 @@ -BSD License
-
-Copyright (c) 2000-2006, www.hamcrest.org
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer. Redistributions in binary form must reproduce
-the above copyright notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither the name of Hamcrest nor the names of its contributors may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
|