You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2019/06/13 19:26:45 UTC

[incubator-datasketches-memory] branch LicenseSwap created (now 8ffed2b)

This is an automated email from the ASF dual-hosted git repository.

leerho pushed a change to branch LicenseSwap
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-memory.git.


      at 8ffed2b  License Swap, 90 files

This branch includes the following new commits:

     new 8ffed2b  License Swap, 90 files

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org


[incubator-datasketches-memory] 01/01: License Swap, 90 files

Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

leerho pushed a commit to branch LicenseSwap
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-memory.git

commit 8ffed2bb4b57a0da5ba41a21d646cb0cd01a4c2d
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Thu Jun 13 12:26:12 2019 -0700

    License Swap, 90 files
---
 src/main/java/com/yahoo/memory/AccessByteBuffer.java  | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/AllocateDirect.java    | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/AllocateDirectMap.java | 18 ++++++++++++++++--
 .../com/yahoo/memory/AllocateDirectWritableMap.java   | 18 ++++++++++++++++--
 .../yahoo/memory/BBNonNativeWritableBufferImpl.java   | 18 ++++++++++++++++--
 .../yahoo/memory/BBNonNativeWritableMemoryImpl.java   | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/BBWritableBufferImpl.java   | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/BBWritableMemoryImpl.java   | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/BaseBuffer.java        | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/BaseState.java         | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/BaseWritableBufferImpl.java | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/BaseWritableMemoryImpl.java | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/Buffer.java            | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/CompareAndCopy.java    | 18 ++++++++++++++++--
 .../com/yahoo/memory/DefaultMemoryRequestServer.java  | 18 ++++++++++++++++--
 .../memory/DirectNonNativeWritableBufferImpl.java     | 18 ++++++++++++++++--
 .../memory/DirectNonNativeWritableMemoryImpl.java     | 18 ++++++++++++++++--
 .../com/yahoo/memory/DirectWritableBufferImpl.java    | 18 ++++++++++++++++--
 .../com/yahoo/memory/DirectWritableMemoryImpl.java    | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/Handle.java            | 18 ++++++++++++++++--
 .../yahoo/memory/HeapNonNativeWritableBufferImpl.java | 18 ++++++++++++++++--
 .../yahoo/memory/HeapNonNativeWritableMemoryImpl.java | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/HeapWritableBufferImpl.java | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/HeapWritableMemoryImpl.java | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/Ints.java              | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/JDK7Compatible.java    | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/Map.java               | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/MapHandle.java         | 18 ++++++++++++++++--
 .../yahoo/memory/MapNonNativeWritableBufferImpl.java  | 18 ++++++++++++++++--
 .../yahoo/memory/MapNonNativeWritableMemoryImpl.java  | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/MapWritableBufferImpl.java  | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/MapWritableMemoryImpl.java  | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/Memory.java            | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/MemoryRequestServer.java    | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/NioBits.java           | 18 ++++++++++++++++--
 .../com/yahoo/memory/NonNativeWritableBufferImpl.java | 18 ++++++++++++++++--
 .../com/yahoo/memory/NonNativeWritableMemoryImpl.java | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/Prim.java              | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/ReadOnlyException.java | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/StepBoolean.java       | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/UnsafeUtil.java        | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/Utf8.java              | 19 +++++++++++++++++++
 .../java/com/yahoo/memory/Utf8CodingException.java    | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/Util.java              | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/WritableBuffer.java    | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/WritableBufferImpl.java     | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/WritableDirectHandle.java   | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/WritableHandle.java    | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/WritableMap.java       | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/WritableMapHandle.java | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/WritableMemory.java    | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/WritableMemoryImpl.java     | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/XxHash64.java          | 18 ++++++++++++++++--
 src/main/java/com/yahoo/memory/package-info.java      | 19 +++++++++++++++++++
 .../com/yahoo/memory/AllocateDirectMapMemoryTest.java | 18 ++++++++++++++++--
 .../com/yahoo/memory/AllocateDirectMemoryTest.java    | 18 ++++++++++++++++--
 .../memory/AllocateDirectWritableMapMemoryTest.java   | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/BaseBufferTest.java    | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/BaseStateTest.java     | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/Buffer2Test.java       | 19 +++++++++++++++++++
 .../com/yahoo/memory/BufferBoundaryCheckTest.java     | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/BufferInvariantsTest.java   | 18 ++++++++++++++++--
 .../com/yahoo/memory/BufferReadWriteSafetyTest.java   | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/BufferTest.java        | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/CommonBufferTest.java  | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/CommonMemoryTest.java  | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/CopyMemoryOverlapTest.java  | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/CopyMemoryTest.java    | 18 ++++++++++++++++--
 .../yahoo/memory/ExampleMemoryRequestServerTest.java  | 18 ++++++++++++++++--
 .../com/yahoo/memory/IgnoredArrayOverflowTest.java    | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/IsValidUtf8TestUtil.java    | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/LeafImplTest.java      | 18 ++++++++++++++++--
 .../com/yahoo/memory/MemoryBoundaryCheckTest.java     | 18 ++++++++++++++++--
 .../com/yahoo/memory/MemoryReadWriteSafetyTest.java   | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/MemoryTest.java        | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/MemoryWriteToTest.java | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/NioBitsTest.java       | 18 ++++++++++++++++--
 .../yahoo/memory/NonNativeWritableBufferImplTest.java | 18 ++++++++++++++++--
 .../yahoo/memory/NonNativeWritableMemoryImplTest.java | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/SpecificLeafTest.java  | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/UnsafeUtilTest.java    | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/Utf8Test.java          | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/UtilTest.java          | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/WritableBufferImplTest.java | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/WritableDirectCopyTest.java | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/WritableMemoryImplTest.java | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/WritableMemoryTest.java     | 18 ++++++++++++++++--
 .../java/com/yahoo/memory/XxHash64LoopingTest.java    | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/XxHash64Test.java      | 18 ++++++++++++++++--
 src/test/java/com/yahoo/memory/ZeroCapacityTest.java  | 18 ++++++++++++++++--
 90 files changed, 1449 insertions(+), 174 deletions(-)

diff --git a/src/main/java/com/yahoo/memory/AccessByteBuffer.java b/src/main/java/com/yahoo/memory/AccessByteBuffer.java
index f0366d3..b08b372 100644
--- a/src/main/java/com/yahoo/memory/AccessByteBuffer.java
+++ b/src/main/java/com/yahoo/memory/AccessByteBuffer.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/AllocateDirect.java b/src/main/java/com/yahoo/memory/AllocateDirect.java
index 24e847e..388f442 100644
--- a/src/main/java/com/yahoo/memory/AllocateDirect.java
+++ b/src/main/java/com/yahoo/memory/AllocateDirect.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/AllocateDirectMap.java b/src/main/java/com/yahoo/memory/AllocateDirectMap.java
index a799897..a3674f9 100644
--- a/src/main/java/com/yahoo/memory/AllocateDirectMap.java
+++ b/src/main/java/com/yahoo/memory/AllocateDirectMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/AllocateDirectWritableMap.java b/src/main/java/com/yahoo/memory/AllocateDirectWritableMap.java
index e76a50d..a1e4381 100644
--- a/src/main/java/com/yahoo/memory/AllocateDirectWritableMap.java
+++ b/src/main/java/com/yahoo/memory/AllocateDirectWritableMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/BBNonNativeWritableBufferImpl.java b/src/main/java/com/yahoo/memory/BBNonNativeWritableBufferImpl.java
index c0645fc..3d4b973 100644
--- a/src/main/java/com/yahoo/memory/BBNonNativeWritableBufferImpl.java
+++ b/src/main/java/com/yahoo/memory/BBNonNativeWritableBufferImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/BBNonNativeWritableMemoryImpl.java b/src/main/java/com/yahoo/memory/BBNonNativeWritableMemoryImpl.java
index e760cef..a23b264 100644
--- a/src/main/java/com/yahoo/memory/BBNonNativeWritableMemoryImpl.java
+++ b/src/main/java/com/yahoo/memory/BBNonNativeWritableMemoryImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/BBWritableBufferImpl.java b/src/main/java/com/yahoo/memory/BBWritableBufferImpl.java
index bacfee4..eb95ee3 100644
--- a/src/main/java/com/yahoo/memory/BBWritableBufferImpl.java
+++ b/src/main/java/com/yahoo/memory/BBWritableBufferImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/BBWritableMemoryImpl.java b/src/main/java/com/yahoo/memory/BBWritableMemoryImpl.java
index 99ef8b7..045dfab 100644
--- a/src/main/java/com/yahoo/memory/BBWritableMemoryImpl.java
+++ b/src/main/java/com/yahoo/memory/BBWritableMemoryImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/BaseBuffer.java b/src/main/java/com/yahoo/memory/BaseBuffer.java
index 0dbe7bf..0dc06a7 100644
--- a/src/main/java/com/yahoo/memory/BaseBuffer.java
+++ b/src/main/java/com/yahoo/memory/BaseBuffer.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/BaseState.java b/src/main/java/com/yahoo/memory/BaseState.java
index 20c0c12..9851b51 100644
--- a/src/main/java/com/yahoo/memory/BaseState.java
+++ b/src/main/java/com/yahoo/memory/BaseState.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/BaseWritableBufferImpl.java b/src/main/java/com/yahoo/memory/BaseWritableBufferImpl.java
index fa77dc1..99ede46 100644
--- a/src/main/java/com/yahoo/memory/BaseWritableBufferImpl.java
+++ b/src/main/java/com/yahoo/memory/BaseWritableBufferImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/BaseWritableMemoryImpl.java b/src/main/java/com/yahoo/memory/BaseWritableMemoryImpl.java
index 041a46e..50a62b3 100644
--- a/src/main/java/com/yahoo/memory/BaseWritableMemoryImpl.java
+++ b/src/main/java/com/yahoo/memory/BaseWritableMemoryImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/Buffer.java b/src/main/java/com/yahoo/memory/Buffer.java
index f0931bf..a57b968 100644
--- a/src/main/java/com/yahoo/memory/Buffer.java
+++ b/src/main/java/com/yahoo/memory/Buffer.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/CompareAndCopy.java b/src/main/java/com/yahoo/memory/CompareAndCopy.java
index e56ff31..5fab910 100644
--- a/src/main/java/com/yahoo/memory/CompareAndCopy.java
+++ b/src/main/java/com/yahoo/memory/CompareAndCopy.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/DefaultMemoryRequestServer.java b/src/main/java/com/yahoo/memory/DefaultMemoryRequestServer.java
index 17bc3d3..a39c1b4 100644
--- a/src/main/java/com/yahoo/memory/DefaultMemoryRequestServer.java
+++ b/src/main/java/com/yahoo/memory/DefaultMemoryRequestServer.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/DirectNonNativeWritableBufferImpl.java b/src/main/java/com/yahoo/memory/DirectNonNativeWritableBufferImpl.java
index 3598631..091c19a 100644
--- a/src/main/java/com/yahoo/memory/DirectNonNativeWritableBufferImpl.java
+++ b/src/main/java/com/yahoo/memory/DirectNonNativeWritableBufferImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/DirectNonNativeWritableMemoryImpl.java b/src/main/java/com/yahoo/memory/DirectNonNativeWritableMemoryImpl.java
index fc17382..a6d8ada 100644
--- a/src/main/java/com/yahoo/memory/DirectNonNativeWritableMemoryImpl.java
+++ b/src/main/java/com/yahoo/memory/DirectNonNativeWritableMemoryImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/DirectWritableBufferImpl.java b/src/main/java/com/yahoo/memory/DirectWritableBufferImpl.java
index 436d11a..938480e 100644
--- a/src/main/java/com/yahoo/memory/DirectWritableBufferImpl.java
+++ b/src/main/java/com/yahoo/memory/DirectWritableBufferImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/DirectWritableMemoryImpl.java b/src/main/java/com/yahoo/memory/DirectWritableMemoryImpl.java
index bd72586..c50e71a 100644
--- a/src/main/java/com/yahoo/memory/DirectWritableMemoryImpl.java
+++ b/src/main/java/com/yahoo/memory/DirectWritableMemoryImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/Handle.java b/src/main/java/com/yahoo/memory/Handle.java
index 1845152..0ae1f5a 100644
--- a/src/main/java/com/yahoo/memory/Handle.java
+++ b/src/main/java/com/yahoo/memory/Handle.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/HeapNonNativeWritableBufferImpl.java b/src/main/java/com/yahoo/memory/HeapNonNativeWritableBufferImpl.java
index 72b428d..414919d 100644
--- a/src/main/java/com/yahoo/memory/HeapNonNativeWritableBufferImpl.java
+++ b/src/main/java/com/yahoo/memory/HeapNonNativeWritableBufferImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/HeapNonNativeWritableMemoryImpl.java b/src/main/java/com/yahoo/memory/HeapNonNativeWritableMemoryImpl.java
index 8bda625..bc5e99d 100644
--- a/src/main/java/com/yahoo/memory/HeapNonNativeWritableMemoryImpl.java
+++ b/src/main/java/com/yahoo/memory/HeapNonNativeWritableMemoryImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/HeapWritableBufferImpl.java b/src/main/java/com/yahoo/memory/HeapWritableBufferImpl.java
index 80869a8..c72af41 100644
--- a/src/main/java/com/yahoo/memory/HeapWritableBufferImpl.java
+++ b/src/main/java/com/yahoo/memory/HeapWritableBufferImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/HeapWritableMemoryImpl.java b/src/main/java/com/yahoo/memory/HeapWritableMemoryImpl.java
index 26702fe..7a0a594 100644
--- a/src/main/java/com/yahoo/memory/HeapWritableMemoryImpl.java
+++ b/src/main/java/com/yahoo/memory/HeapWritableMemoryImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/Ints.java b/src/main/java/com/yahoo/memory/Ints.java
index c203103..66c3c08 100644
--- a/src/main/java/com/yahoo/memory/Ints.java
+++ b/src/main/java/com/yahoo/memory/Ints.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/JDK7Compatible.java b/src/main/java/com/yahoo/memory/JDK7Compatible.java
index 62047da..de6c5d7 100644
--- a/src/main/java/com/yahoo/memory/JDK7Compatible.java
+++ b/src/main/java/com/yahoo/memory/JDK7Compatible.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/Map.java b/src/main/java/com/yahoo/memory/Map.java
index 805a9ab..eb4e228 100644
--- a/src/main/java/com/yahoo/memory/Map.java
+++ b/src/main/java/com/yahoo/memory/Map.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/MapHandle.java b/src/main/java/com/yahoo/memory/MapHandle.java
index 07e5f4e..9d34091 100644
--- a/src/main/java/com/yahoo/memory/MapHandle.java
+++ b/src/main/java/com/yahoo/memory/MapHandle.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/MapNonNativeWritableBufferImpl.java b/src/main/java/com/yahoo/memory/MapNonNativeWritableBufferImpl.java
index f0cb2d4..c27a7f6 100644
--- a/src/main/java/com/yahoo/memory/MapNonNativeWritableBufferImpl.java
+++ b/src/main/java/com/yahoo/memory/MapNonNativeWritableBufferImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/MapNonNativeWritableMemoryImpl.java b/src/main/java/com/yahoo/memory/MapNonNativeWritableMemoryImpl.java
index 9822426..c9805f1 100644
--- a/src/main/java/com/yahoo/memory/MapNonNativeWritableMemoryImpl.java
+++ b/src/main/java/com/yahoo/memory/MapNonNativeWritableMemoryImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/MapWritableBufferImpl.java b/src/main/java/com/yahoo/memory/MapWritableBufferImpl.java
index 8762062..2404af9 100644
--- a/src/main/java/com/yahoo/memory/MapWritableBufferImpl.java
+++ b/src/main/java/com/yahoo/memory/MapWritableBufferImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/MapWritableMemoryImpl.java b/src/main/java/com/yahoo/memory/MapWritableMemoryImpl.java
index c18330b..0eabfae 100644
--- a/src/main/java/com/yahoo/memory/MapWritableMemoryImpl.java
+++ b/src/main/java/com/yahoo/memory/MapWritableMemoryImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/Memory.java b/src/main/java/com/yahoo/memory/Memory.java
index ce96fcc..4bac4c4 100644
--- a/src/main/java/com/yahoo/memory/Memory.java
+++ b/src/main/java/com/yahoo/memory/Memory.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/MemoryRequestServer.java b/src/main/java/com/yahoo/memory/MemoryRequestServer.java
index 29243ff..3b039bd 100644
--- a/src/main/java/com/yahoo/memory/MemoryRequestServer.java
+++ b/src/main/java/com/yahoo/memory/MemoryRequestServer.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015, Yahoo, Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/NioBits.java b/src/main/java/com/yahoo/memory/NioBits.java
index ea5d330..0680482 100644
--- a/src/main/java/com/yahoo/memory/NioBits.java
+++ b/src/main/java/com/yahoo/memory/NioBits.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/NonNativeWritableBufferImpl.java b/src/main/java/com/yahoo/memory/NonNativeWritableBufferImpl.java
index face4a3..8288ca1 100644
--- a/src/main/java/com/yahoo/memory/NonNativeWritableBufferImpl.java
+++ b/src/main/java/com/yahoo/memory/NonNativeWritableBufferImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/NonNativeWritableMemoryImpl.java b/src/main/java/com/yahoo/memory/NonNativeWritableMemoryImpl.java
index 244c7f5..5108ee3 100644
--- a/src/main/java/com/yahoo/memory/NonNativeWritableMemoryImpl.java
+++ b/src/main/java/com/yahoo/memory/NonNativeWritableMemoryImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/Prim.java b/src/main/java/com/yahoo/memory/Prim.java
index 630ac08..9a735a8 100644
--- a/src/main/java/com/yahoo/memory/Prim.java
+++ b/src/main/java/com/yahoo/memory/Prim.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/ReadOnlyException.java b/src/main/java/com/yahoo/memory/ReadOnlyException.java
index 0c27385..8d4cec2 100644
--- a/src/main/java/com/yahoo/memory/ReadOnlyException.java
+++ b/src/main/java/com/yahoo/memory/ReadOnlyException.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/StepBoolean.java b/src/main/java/com/yahoo/memory/StepBoolean.java
index 6eff63e..76a0933 100644
--- a/src/main/java/com/yahoo/memory/StepBoolean.java
+++ b/src/main/java/com/yahoo/memory/StepBoolean.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/UnsafeUtil.java b/src/main/java/com/yahoo/memory/UnsafeUtil.java
index a1c3054..983ae61 100644
--- a/src/main/java/com/yahoo/memory/UnsafeUtil.java
+++ b/src/main/java/com/yahoo/memory/UnsafeUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2015-16, Yahoo! Inc.
- * Licensed under the terms of the Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/Utf8.java b/src/main/java/com/yahoo/memory/Utf8.java
index 79e914f..5745099 100644
--- a/src/main/java/com/yahoo/memory/Utf8.java
+++ b/src/main/java/com/yahoo/memory/Utf8.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
 package com.yahoo.memory;
 
 import static com.yahoo.memory.UnsafeUtil.unsafe;
diff --git a/src/main/java/com/yahoo/memory/Utf8CodingException.java b/src/main/java/com/yahoo/memory/Utf8CodingException.java
index 732bd52..aa33331 100644
--- a/src/main/java/com/yahoo/memory/Utf8CodingException.java
+++ b/src/main/java/com/yahoo/memory/Utf8CodingException.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/Util.java b/src/main/java/com/yahoo/memory/Util.java
index 4e7064f..41466bf 100644
--- a/src/main/java/com/yahoo/memory/Util.java
+++ b/src/main/java/com/yahoo/memory/Util.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/WritableBuffer.java b/src/main/java/com/yahoo/memory/WritableBuffer.java
index f1e0986..2c6ac2f 100644
--- a/src/main/java/com/yahoo/memory/WritableBuffer.java
+++ b/src/main/java/com/yahoo/memory/WritableBuffer.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/WritableBufferImpl.java b/src/main/java/com/yahoo/memory/WritableBufferImpl.java
index 18ed4d5..54cf2f9 100644
--- a/src/main/java/com/yahoo/memory/WritableBufferImpl.java
+++ b/src/main/java/com/yahoo/memory/WritableBufferImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/WritableDirectHandle.java b/src/main/java/com/yahoo/memory/WritableDirectHandle.java
index b08f944..e28f493 100644
--- a/src/main/java/com/yahoo/memory/WritableDirectHandle.java
+++ b/src/main/java/com/yahoo/memory/WritableDirectHandle.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/WritableHandle.java b/src/main/java/com/yahoo/memory/WritableHandle.java
index e8aebe7..1aebf91 100644
--- a/src/main/java/com/yahoo/memory/WritableHandle.java
+++ b/src/main/java/com/yahoo/memory/WritableHandle.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/WritableMap.java b/src/main/java/com/yahoo/memory/WritableMap.java
index c9f4ee6..d2dd552 100644
--- a/src/main/java/com/yahoo/memory/WritableMap.java
+++ b/src/main/java/com/yahoo/memory/WritableMap.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/WritableMapHandle.java b/src/main/java/com/yahoo/memory/WritableMapHandle.java
index b5e36e6..d6b243b 100644
--- a/src/main/java/com/yahoo/memory/WritableMapHandle.java
+++ b/src/main/java/com/yahoo/memory/WritableMapHandle.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/WritableMemory.java b/src/main/java/com/yahoo/memory/WritableMemory.java
index 482c0f2..3bea966 100644
--- a/src/main/java/com/yahoo/memory/WritableMemory.java
+++ b/src/main/java/com/yahoo/memory/WritableMemory.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/WritableMemoryImpl.java b/src/main/java/com/yahoo/memory/WritableMemoryImpl.java
index 324449c..e089671 100644
--- a/src/main/java/com/yahoo/memory/WritableMemoryImpl.java
+++ b/src/main/java/com/yahoo/memory/WritableMemoryImpl.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/XxHash64.java b/src/main/java/com/yahoo/memory/XxHash64.java
index cc96147..2c7b84d 100644
--- a/src/main/java/com/yahoo/memory/XxHash64.java
+++ b/src/main/java/com/yahoo/memory/XxHash64.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/main/java/com/yahoo/memory/package-info.java b/src/main/java/com/yahoo/memory/package-info.java
index 8335726..c51bc19 100644
--- a/src/main/java/com/yahoo/memory/package-info.java
+++ b/src/main/java/com/yahoo/memory/package-info.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
 /**
  * <p>This package provides high performance primitive and primitive array access to direct (native),
  * off-heap memory and memory-mapped file resources, and consistent views into
diff --git a/src/test/java/com/yahoo/memory/AllocateDirectMapMemoryTest.java b/src/test/java/com/yahoo/memory/AllocateDirectMapMemoryTest.java
index e93129a..4703bbf 100644
--- a/src/test/java/com/yahoo/memory/AllocateDirectMapMemoryTest.java
+++ b/src/test/java/com/yahoo/memory/AllocateDirectMapMemoryTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/AllocateDirectMemoryTest.java b/src/test/java/com/yahoo/memory/AllocateDirectMemoryTest.java
index 9270921..c3c46d9 100644
--- a/src/test/java/com/yahoo/memory/AllocateDirectMemoryTest.java
+++ b/src/test/java/com/yahoo/memory/AllocateDirectMemoryTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/AllocateDirectWritableMapMemoryTest.java b/src/test/java/com/yahoo/memory/AllocateDirectWritableMapMemoryTest.java
index 098d176..083c14b 100644
--- a/src/test/java/com/yahoo/memory/AllocateDirectWritableMapMemoryTest.java
+++ b/src/test/java/com/yahoo/memory/AllocateDirectWritableMapMemoryTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/BaseBufferTest.java b/src/test/java/com/yahoo/memory/BaseBufferTest.java
index 70c835c..3df14a5 100644
--- a/src/test/java/com/yahoo/memory/BaseBufferTest.java
+++ b/src/test/java/com/yahoo/memory/BaseBufferTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/BaseStateTest.java b/src/test/java/com/yahoo/memory/BaseStateTest.java
index f235504..f72bad7 100644
--- a/src/test/java/com/yahoo/memory/BaseStateTest.java
+++ b/src/test/java/com/yahoo/memory/BaseStateTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/Buffer2Test.java b/src/test/java/com/yahoo/memory/Buffer2Test.java
index ebe02b7..a50cbac 100644
--- a/src/test/java/com/yahoo/memory/Buffer2Test.java
+++ b/src/test/java/com/yahoo/memory/Buffer2Test.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
 package com.yahoo.memory;
 
 import static org.testng.Assert.assertEquals;
diff --git a/src/test/java/com/yahoo/memory/BufferBoundaryCheckTest.java b/src/test/java/com/yahoo/memory/BufferBoundaryCheckTest.java
index fd12e12..c9dbce2 100644
--- a/src/test/java/com/yahoo/memory/BufferBoundaryCheckTest.java
+++ b/src/test/java/com/yahoo/memory/BufferBoundaryCheckTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/BufferInvariantsTest.java b/src/test/java/com/yahoo/memory/BufferInvariantsTest.java
index 62a76de..321262a 100644
--- a/src/test/java/com/yahoo/memory/BufferInvariantsTest.java
+++ b/src/test/java/com/yahoo/memory/BufferInvariantsTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/BufferReadWriteSafetyTest.java b/src/test/java/com/yahoo/memory/BufferReadWriteSafetyTest.java
index b22d9d2..b97cc54 100644
--- a/src/test/java/com/yahoo/memory/BufferReadWriteSafetyTest.java
+++ b/src/test/java/com/yahoo/memory/BufferReadWriteSafetyTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/BufferTest.java b/src/test/java/com/yahoo/memory/BufferTest.java
index 042e0b0..34890f8 100644
--- a/src/test/java/com/yahoo/memory/BufferTest.java
+++ b/src/test/java/com/yahoo/memory/BufferTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/CommonBufferTest.java b/src/test/java/com/yahoo/memory/CommonBufferTest.java
index 1831045..c3f678a 100644
--- a/src/test/java/com/yahoo/memory/CommonBufferTest.java
+++ b/src/test/java/com/yahoo/memory/CommonBufferTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/CommonMemoryTest.java b/src/test/java/com/yahoo/memory/CommonMemoryTest.java
index 45e00a1..a6d43f3 100644
--- a/src/test/java/com/yahoo/memory/CommonMemoryTest.java
+++ b/src/test/java/com/yahoo/memory/CommonMemoryTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/CopyMemoryOverlapTest.java b/src/test/java/com/yahoo/memory/CopyMemoryOverlapTest.java
index caac9ec..5165156 100644
--- a/src/test/java/com/yahoo/memory/CopyMemoryOverlapTest.java
+++ b/src/test/java/com/yahoo/memory/CopyMemoryOverlapTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/CopyMemoryTest.java b/src/test/java/com/yahoo/memory/CopyMemoryTest.java
index 015c648..ec65d8f 100644
--- a/src/test/java/com/yahoo/memory/CopyMemoryTest.java
+++ b/src/test/java/com/yahoo/memory/CopyMemoryTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/ExampleMemoryRequestServerTest.java b/src/test/java/com/yahoo/memory/ExampleMemoryRequestServerTest.java
index c7dae8b..95cf7fd 100644
--- a/src/test/java/com/yahoo/memory/ExampleMemoryRequestServerTest.java
+++ b/src/test/java/com/yahoo/memory/ExampleMemoryRequestServerTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/IgnoredArrayOverflowTest.java b/src/test/java/com/yahoo/memory/IgnoredArrayOverflowTest.java
index c2e3ff9..11d675a 100644
--- a/src/test/java/com/yahoo/memory/IgnoredArrayOverflowTest.java
+++ b/src/test/java/com/yahoo/memory/IgnoredArrayOverflowTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/IsValidUtf8TestUtil.java b/src/test/java/com/yahoo/memory/IsValidUtf8TestUtil.java
index c88b1e1..b5b6e57 100644
--- a/src/test/java/com/yahoo/memory/IsValidUtf8TestUtil.java
+++ b/src/test/java/com/yahoo/memory/IsValidUtf8TestUtil.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/LeafImplTest.java b/src/test/java/com/yahoo/memory/LeafImplTest.java
index 7e41edf..a02d308 100644
--- a/src/test/java/com/yahoo/memory/LeafImplTest.java
+++ b/src/test/java/com/yahoo/memory/LeafImplTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/MemoryBoundaryCheckTest.java b/src/test/java/com/yahoo/memory/MemoryBoundaryCheckTest.java
index c50c676..669a610 100644
--- a/src/test/java/com/yahoo/memory/MemoryBoundaryCheckTest.java
+++ b/src/test/java/com/yahoo/memory/MemoryBoundaryCheckTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/MemoryReadWriteSafetyTest.java b/src/test/java/com/yahoo/memory/MemoryReadWriteSafetyTest.java
index f3051b6..d9e97f0 100644
--- a/src/test/java/com/yahoo/memory/MemoryReadWriteSafetyTest.java
+++ b/src/test/java/com/yahoo/memory/MemoryReadWriteSafetyTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/MemoryTest.java b/src/test/java/com/yahoo/memory/MemoryTest.java
index b72e928..10283d7 100644
--- a/src/test/java/com/yahoo/memory/MemoryTest.java
+++ b/src/test/java/com/yahoo/memory/MemoryTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/MemoryWriteToTest.java b/src/test/java/com/yahoo/memory/MemoryWriteToTest.java
index aaf8789..343255a 100644
--- a/src/test/java/com/yahoo/memory/MemoryWriteToTest.java
+++ b/src/test/java/com/yahoo/memory/MemoryWriteToTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/NioBitsTest.java b/src/test/java/com/yahoo/memory/NioBitsTest.java
index 12a0fcc..c0e0f77 100644
--- a/src/test/java/com/yahoo/memory/NioBitsTest.java
+++ b/src/test/java/com/yahoo/memory/NioBitsTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/NonNativeWritableBufferImplTest.java b/src/test/java/com/yahoo/memory/NonNativeWritableBufferImplTest.java
index 8e31cb0..a6ac729 100644
--- a/src/test/java/com/yahoo/memory/NonNativeWritableBufferImplTest.java
+++ b/src/test/java/com/yahoo/memory/NonNativeWritableBufferImplTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/NonNativeWritableMemoryImplTest.java b/src/test/java/com/yahoo/memory/NonNativeWritableMemoryImplTest.java
index e4a9d99..12ec453 100644
--- a/src/test/java/com/yahoo/memory/NonNativeWritableMemoryImplTest.java
+++ b/src/test/java/com/yahoo/memory/NonNativeWritableMemoryImplTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/SpecificLeafTest.java b/src/test/java/com/yahoo/memory/SpecificLeafTest.java
index 2df6a06..5a1291b 100644
--- a/src/test/java/com/yahoo/memory/SpecificLeafTest.java
+++ b/src/test/java/com/yahoo/memory/SpecificLeafTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/UnsafeUtilTest.java b/src/test/java/com/yahoo/memory/UnsafeUtilTest.java
index bdc7fea..e9236b6 100644
--- a/src/test/java/com/yahoo/memory/UnsafeUtilTest.java
+++ b/src/test/java/com/yahoo/memory/UnsafeUtilTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/Utf8Test.java b/src/test/java/com/yahoo/memory/Utf8Test.java
index 1cf7eb1..0924cd9 100644
--- a/src/test/java/com/yahoo/memory/Utf8Test.java
+++ b/src/test/java/com/yahoo/memory/Utf8Test.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/UtilTest.java b/src/test/java/com/yahoo/memory/UtilTest.java
index 6406a8e..80fccaf 100644
--- a/src/test/java/com/yahoo/memory/UtilTest.java
+++ b/src/test/java/com/yahoo/memory/UtilTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/WritableBufferImplTest.java b/src/test/java/com/yahoo/memory/WritableBufferImplTest.java
index 4e8aa7c..aec3302 100644
--- a/src/test/java/com/yahoo/memory/WritableBufferImplTest.java
+++ b/src/test/java/com/yahoo/memory/WritableBufferImplTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/WritableDirectCopyTest.java b/src/test/java/com/yahoo/memory/WritableDirectCopyTest.java
index 422e85c..9618add 100644
--- a/src/test/java/com/yahoo/memory/WritableDirectCopyTest.java
+++ b/src/test/java/com/yahoo/memory/WritableDirectCopyTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/WritableMemoryImplTest.java b/src/test/java/com/yahoo/memory/WritableMemoryImplTest.java
index 0d608be..1f8f3e6 100644
--- a/src/test/java/com/yahoo/memory/WritableMemoryImplTest.java
+++ b/src/test/java/com/yahoo/memory/WritableMemoryImplTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/WritableMemoryTest.java b/src/test/java/com/yahoo/memory/WritableMemoryTest.java
index da30e6a..c7b533f 100644
--- a/src/test/java/com/yahoo/memory/WritableMemoryTest.java
+++ b/src/test/java/com/yahoo/memory/WritableMemoryTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2017, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/XxHash64LoopingTest.java b/src/test/java/com/yahoo/memory/XxHash64LoopingTest.java
index 67a56cf..9f9b74c 100644
--- a/src/test/java/com/yahoo/memory/XxHash64LoopingTest.java
+++ b/src/test/java/com/yahoo/memory/XxHash64LoopingTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/XxHash64Test.java b/src/test/java/com/yahoo/memory/XxHash64Test.java
index f93f8ed..1571e8a 100644
--- a/src/test/java/com/yahoo/memory/XxHash64Test.java
+++ b/src/test/java/com/yahoo/memory/XxHash64Test.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;
diff --git a/src/test/java/com/yahoo/memory/ZeroCapacityTest.java b/src/test/java/com/yahoo/memory/ZeroCapacityTest.java
index 54ae5c8..c45f361 100644
--- a/src/test/java/com/yahoo/memory/ZeroCapacityTest.java
+++ b/src/test/java/com/yahoo/memory/ZeroCapacityTest.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2018, Yahoo! Inc. Licensed under the terms of the
- * Apache License 2.0. See LICENSE file at the project root for terms.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
  */
 
 package com.yahoo.memory;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org