Skip to content

Commit 04f3533

Browse files
committed
test: Update to license-test-files bee8966 (Apache-1.0: Add missing closing quote)
Similar to 36bce3f (test: Add license-test-files with read-tree, 2018-01-03): $ git config remote.test.url https://github.com/wking/license-test-files $ git fetch test $ git merge -s ours --allow-unrelated-histories --no-commit test/apache-1.0-missing-quote $ git rm -r test $ git read-tree --prefix=test/ -u test/apache-1.0-missing-quote $ rm test/README.md test/testfiles-1.0-for-license-list-2.6.tar $ git add test The remote.test.url update is because Gary hasn't landed my just-filed [1]. The 'git rm' call avoids: $ git read-tree --prefix=test/ -u test/apache-1.0-missing-quote error: Entry 'test/simpleTestForGenerator/0BSD.txt' overlaps with 'test/simpleTestForGenerator/0BSD.txt'. Cannot bind. This catches the test data up with 558562e (Add missing close quote to Apache-1.0.xml, 2017-12-30, #588) and b975b3e (Remove section 4.g. from BitTorrent-1.0 license, 2017-12-30, #589). [1]: goneall/license-test-files#2
2 parents 791b534 + bee8966 commit 04f3533

File tree

2 files changed

+324
-65
lines changed

2 files changed

+324
-65
lines changed

test/simpleTestForGenerator/Apache-1.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Redistribution and use in source and binary forms, with or without modification,
1313
5. Products derived from this software may not be called "Apache" nor may "Apache" appear in their name, without prior written permission of the Apache Group.
1414

1515
6. Redistributions of any form whatsoever must retain the following acknowledgment:
16-
"This product includes software developed by the Apache Group for use in the Apache HTTP server project (http://www.apache.org/).
16+
"This product includes software developed by the Apache Group for use in the Apache HTTP server project (http://www.apache.org/)."
1717

1818
THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY EXPRESSED 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 APACHE GROUP OR ITS 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.
1919

0 commit comments

Comments
 (0)