From a9785bfd7b01ddc83ac4b6d8d6a0e9f3222b21d4 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <jonbratseth@yahoo.com>
Date: Tue, 13 Jun 2017 20:46:46 +0200
Subject: Revert "Copyright header"

---
 testutil/pom.xml                                                    | 2 +-
 testutil/src/main/java/com/yahoo/test/CollectionPatternMatcher.java | 2 +-
 testutil/src/main/java/com/yahoo/test/LinePatternMatcher.java       | 4 ++--
 testutil/src/main/java/com/yahoo/test/ManualClock.java              | 2 +-
 testutil/src/main/java/com/yahoo/test/Matchers.java                 | 2 +-
 testutil/src/main/java/com/yahoo/test/OrderTester.java              | 2 +-
 testutil/src/main/java/com/yahoo/test/PartialOrderTester.java       | 2 +-
 testutil/src/main/java/com/yahoo/test/PatternMatcher.java           | 4 ++--
 testutil/src/main/java/com/yahoo/test/TotalOrderTester.java         | 2 +-
 testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java      | 2 +-
 testutil/src/test/java/com/yahoo/test/MatchersTestCase.java         | 2 +-
 testutil/src/test/java/com/yahoo/test/OrderTesterTest.java          | 2 +-
 testutil/src/test/java/com/yahoo/test/PatternMatchersTestCase.java  | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'testutil')

diff --git a/testutil/pom.xml b/testutil/pom.xml
index 9f98f40c2d0..dc765a35409 100644
--- a/testutil/pom.xml
+++ b/testutil/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
diff --git a/testutil/src/main/java/com/yahoo/test/CollectionPatternMatcher.java b/testutil/src/main/java/com/yahoo/test/CollectionPatternMatcher.java
index 609a5558027..12cf0f671f9 100644
--- a/testutil/src/main/java/com/yahoo/test/CollectionPatternMatcher.java
+++ b/testutil/src/main/java/com/yahoo/test/CollectionPatternMatcher.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test;
 
 import org.hamcrest.BaseMatcher;
diff --git a/testutil/src/main/java/com/yahoo/test/LinePatternMatcher.java b/testutil/src/main/java/com/yahoo/test/LinePatternMatcher.java
index 53138367afc..c1cb8e4032c 100644
--- a/testutil/src/main/java/com/yahoo/test/LinePatternMatcher.java
+++ b/testutil/src/main/java/com/yahoo/test/LinePatternMatcher.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test;
 
 import org.hamcrest.BaseMatcher;
@@ -40,4 +40,4 @@ public class LinePatternMatcher extends BaseMatcher<String> {
         return new LinePatternMatcher(pattern);
     }
 
-}
+}
\ No newline at end of file
diff --git a/testutil/src/main/java/com/yahoo/test/ManualClock.java b/testutil/src/main/java/com/yahoo/test/ManualClock.java
index 785e69e4bfd..e3ed647e03b 100644
--- a/testutil/src/main/java/com/yahoo/test/ManualClock.java
+++ b/testutil/src/main/java/com/yahoo/test/ManualClock.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test;
 
 import com.google.inject.Inject;
diff --git a/testutil/src/main/java/com/yahoo/test/Matchers.java b/testutil/src/main/java/com/yahoo/test/Matchers.java
index f0043573c37..80e01b43a18 100644
--- a/testutil/src/main/java/com/yahoo/test/Matchers.java
+++ b/testutil/src/main/java/com/yahoo/test/Matchers.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test;
 
 import org.hamcrest.BaseMatcher;
diff --git a/testutil/src/main/java/com/yahoo/test/OrderTester.java b/testutil/src/main/java/com/yahoo/test/OrderTester.java
index 2c47c868cb1..8e001761164 100644
--- a/testutil/src/main/java/com/yahoo/test/OrderTester.java
+++ b/testutil/src/main/java/com/yahoo/test/OrderTester.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test;
 
 import java.util.ArrayList;
diff --git a/testutil/src/main/java/com/yahoo/test/PartialOrderTester.java b/testutil/src/main/java/com/yahoo/test/PartialOrderTester.java
index c5fa71ddc62..61ee538a815 100644
--- a/testutil/src/main/java/com/yahoo/test/PartialOrderTester.java
+++ b/testutil/src/main/java/com/yahoo/test/PartialOrderTester.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test;
 
 import static org.junit.Assert.assertThat;
diff --git a/testutil/src/main/java/com/yahoo/test/PatternMatcher.java b/testutil/src/main/java/com/yahoo/test/PatternMatcher.java
index 0aafcf2f1be..84cc94e32a2 100644
--- a/testutil/src/main/java/com/yahoo/test/PatternMatcher.java
+++ b/testutil/src/main/java/com/yahoo/test/PatternMatcher.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test;
 
 import org.hamcrest.BaseMatcher;
@@ -35,4 +35,4 @@ public class PatternMatcher extends BaseMatcher<String> {
         return new PatternMatcher(pattern);
     }
 
-}
+}
\ No newline at end of file
diff --git a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
index d9acd845428..bc9bb1494fa 100644
--- a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
+++ b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java b/testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java
index 8a86b922377..a8e8e562b2d 100644
--- a/testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java
+++ b/testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test.json;
 
 import com.google.common.base.Joiner;
diff --git a/testutil/src/test/java/com/yahoo/test/MatchersTestCase.java b/testutil/src/test/java/com/yahoo/test/MatchersTestCase.java
index 6b4d975b98a..c560a0e0624 100644
--- a/testutil/src/test/java/com/yahoo/test/MatchersTestCase.java
+++ b/testutil/src/test/java/com/yahoo/test/MatchersTestCase.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/testutil/src/test/java/com/yahoo/test/OrderTesterTest.java b/testutil/src/test/java/com/yahoo/test/OrderTesterTest.java
index 8376fb5e72e..a9e4212ffc7 100644
--- a/testutil/src/test/java/com/yahoo/test/OrderTesterTest.java
+++ b/testutil/src/test/java/com/yahoo/test/OrderTesterTest.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test;
 
 import org.junit.Test;
diff --git a/testutil/src/test/java/com/yahoo/test/PatternMatchersTestCase.java b/testutil/src/test/java/com/yahoo/test/PatternMatchersTestCase.java
index b17d5b36252..6c9eac53fb1 100644
--- a/testutil/src/test/java/com/yahoo/test/PatternMatchersTestCase.java
+++ b/testutil/src/test/java/com/yahoo/test/PatternMatchersTestCase.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.test;
 
 import static org.junit.Assert.*;
-- 
cgit v1.2.3