From 50cea2d1d72ac197b2d1de77523b884ab19b2f8a Mon Sep 17 00:00:00 2001
From: JP Martin <jpmartin@google.com>
Date: Tue, 21 Jun 2016 11:18:02 -0700
Subject: [PATCH 1/6] Add Apache license

---
 .../cloud/storage/contrib/nio/it/ITGcsNio.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
index cd2c897f609a..317dca49abf6 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.google.cloud.storage.contrib.nio.it;
 
 import static com.google.common.truth.Truth.assertThat;

From c4a61862f7907e8dd2940898f64f1f75cb6dbfe8 Mon Sep 17 00:00:00 2001
From: JP Martin <jpmartin@google.com>
Date: Tue, 21 Jun 2016 11:23:07 -0700
Subject: [PATCH 2/6] Add Apache license to non-NIO files too

---
 .../com/google/cloud/bigquery/BigQueryError.java | 15 +++++++++++++++
 .../com/google/cloud/bigquery/JobStatistics.java | 16 ++++++++++++++++
 .../com/google/cloud/bigquery/JobStatus.java     | 15 +++++++++++++++
 .../cloud/bigquery/UserDefinedFunction.java      | 16 ++++++++++++++++
 .../google/cloud/bigquery/BigQueryErrorTest.java | 16 ++++++++++++++++
 .../spi/DefaultResourceManagerRpc.java           | 16 ++++++++++++++++
 .../testing/LocalResourceManagerHelper.java      | 16 ++++++++++++++++
 .../testing/LocalResourceManagerHelperTest.java  | 16 ++++++++++++++++
 8 files changed, 126 insertions(+)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java
index 121ca578c0d3..379eb38bfc63 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.google.cloud.bigquery;
 
 import com.google.api.services.bigquery.model.ErrorProto;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
index 90ad164a7ce5..f85ae797a3d3 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.cloud.bigquery;
 
 import com.google.api.services.bigquery.model.JobStatistics2;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java
index 7c948e6373f9..455bfdf6b224 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.google.cloud.bigquery;
 
 import com.google.common.base.MoreObjects;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java
index 09fa2563c59f..d92c1302f05f 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.cloud.bigquery;
 
 import com.google.api.services.bigquery.model.UserDefinedFunctionResource;
diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java
index 1d30bb87815e..a1e74d4d9e41 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.cloud.bigquery;
 
 import static org.junit.Assert.assertEquals;
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java
index 427478baef5f..0eeefd5dd4e5 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.cloud.resourcemanager.spi;
 
 import static com.google.cloud.resourcemanager.spi.ResourceManagerRpc.Option.FIELDS;
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java
index 6c16372c0424..1332f46aa3dc 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.cloud.resourcemanager.testing;
 
 import static com.google.common.base.Preconditions.checkArgument;
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java
index cf65b4981bfc..1021e2172dae 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.cloud.resourcemanager.testing;
 
 import static org.junit.Assert.assertEquals;

From e4cb2225c45479a4c28bfab7ac5ff64a40408dbb Mon Sep 17 00:00:00 2001
From: JP Martin <jpmartin@google.com>
Date: Tue, 21 Jun 2016 12:45:20 -0700
Subject: [PATCH 3/6] Automate license check

---
 gcloud-java-contrib/gcloud-java-nio/pom.xml   | 24 +++++++++++++++++++
 .../src/main/checkstyle/java.header           | 15 ++++++++++++
 .../src/main/checkstyle/license-checks.xml    | 11 +++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/java.header
 create mode 100644 gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml

diff --git a/gcloud-java-contrib/gcloud-java-nio/pom.xml b/gcloud-java-contrib/gcloud-java-nio/pom.xml
index 497281b64665..c3a944ecc10a 100644
--- a/gcloud-java-contrib/gcloud-java-nio/pom.xml
+++ b/gcloud-java-contrib/gcloud-java-nio/pom.xml
@@ -75,6 +75,30 @@
   </dependencies>
   <build>
     <plugins>
+      <!-- require the License header in all java files -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <inherited>true</inherited>
+        <executions>
+          <execution>
+            <id>checkstyle</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <configLocation>gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml</configLocation>
+              <consoleOutput>true</consoleOutput>
+              <failOnViolation>true</failOnViolation>
+              <violationSeverity>error</violationSeverity>
+              <failsOnError>true</failsOnError>
+              <includeTestSourceDirectory>true</includeTestSourceDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/java.header b/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/java.header
new file mode 100644
index 000000000000..615040cec16f
--- /dev/null
+++ b/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/java.header
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
\ No newline at end of file
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml b/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml
new file mode 100644
index 000000000000..ef6b5811b6f6
--- /dev/null
+++ b/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+  <module name="Header">
+    <property name="fileExtensions" value="java"/>
+    <property name="ignoreLines" value="2"/>
+    <property name="headerFile" value="src/main/checkstyle/java.header"/>
+  </module>
+</module>
\ No newline at end of file

From d425cbcb3c965da2f0dae57e28ab203d4582265f Mon Sep 17 00:00:00 2001
From: JP Martin <jpmartin@google.com>
Date: Tue, 21 Jun 2016 12:58:04 -0700
Subject: [PATCH 4/6] now compiles from command line, but not from IDE anymore

---
 .../gcloud-java-nio/src/main/checkstyle/license-checks.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml b/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml
index ef6b5811b6f6..3db157f51d86 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml
+++ b/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml
@@ -6,6 +6,6 @@
   <module name="Header">
     <property name="fileExtensions" value="java"/>
     <property name="ignoreLines" value="2"/>
-    <property name="headerFile" value="src/main/checkstyle/java.header"/>
+    <property name="headerFile" value="gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/java.header"/>
   </module>
 </module>
\ No newline at end of file

From 6729f7b485fbdfa68205d4e8adf83fb85ce2ac25 Mon Sep 17 00:00:00 2001
From: JP Martin <jpmartin@google.com>
Date: Tue, 21 Jun 2016 13:46:37 -0700
Subject: [PATCH 5/6] cosmetic, and remove checkstyle header checking

---
 .../google/cloud/bigquery/BigQueryError.java  |  3 ++-
 .../com/google/cloud/bigquery/JobStatus.java  |  3 ++-
 .../cloud/bigquery/BigQueryErrorTest.java     |  2 +-
 gcloud-java-contrib/gcloud-java-nio/pom.xml   | 24 -------------------
 .../src/main/checkstyle/java.header           | 15 ------------
 .../src/main/checkstyle/license-checks.xml    | 11 ---------
 .../storage/contrib/nio/it/ITGcsNio.java      |  3 ++-
 7 files changed, 7 insertions(+), 54 deletions(-)
 delete mode 100644 gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/java.header
 delete mode 100644 gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml

diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java
index 379eb38bfc63..b243cf8b1f99 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.cloud.bigquery;
 
 import com.google.api.services.bigquery.model.ErrorProto;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java
index 455bfdf6b224..b2bfe99a503d 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.cloud.bigquery;
 
 import com.google.common.base.MoreObjects;
diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java
index a1e74d4d9e41..c63095b96528 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gcloud-java-contrib/gcloud-java-nio/pom.xml b/gcloud-java-contrib/gcloud-java-nio/pom.xml
index c3a944ecc10a..497281b64665 100644
--- a/gcloud-java-contrib/gcloud-java-nio/pom.xml
+++ b/gcloud-java-contrib/gcloud-java-nio/pom.xml
@@ -75,30 +75,6 @@
   </dependencies>
   <build>
     <plugins>
-      <!-- require the License header in all java files -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
-        <inherited>true</inherited>
-        <executions>
-          <execution>
-            <id>checkstyle</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <configuration>
-              <configLocation>gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml</configLocation>
-              <consoleOutput>true</consoleOutput>
-              <failOnViolation>true</failOnViolation>
-              <violationSeverity>error</violationSeverity>
-              <failsOnError>true</failsOnError>
-              <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/java.header b/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/java.header
deleted file mode 100644
index 615040cec16f..000000000000
--- a/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/java.header
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
\ No newline at end of file
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml b/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml
deleted file mode 100644
index 3db157f51d86..000000000000
--- a/gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/license-checks.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-<module name="Checker">
-  <module name="Header">
-    <property name="fileExtensions" value="java"/>
-    <property name="ignoreLines" value="2"/>
-    <property name="headerFile" value="gcloud-java-contrib/gcloud-java-nio/src/main/checkstyle/java.header"/>
-  </module>
-</module>
\ No newline at end of file
diff --git a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
index 317dca49abf6..47be28b2fab7 100644
--- a/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
+++ b/gcloud-java-contrib/gcloud-java-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.cloud.storage.contrib.nio.it;
 
 import static com.google.common.truth.Truth.assertThat;

From b623b3dacb65a62178c33c34b8cd28b32f3f43bd Mon Sep 17 00:00:00 2001
From: JP Martin <jpmartin@google.com>
Date: Tue, 21 Jun 2016 13:48:36 -0700
Subject: [PATCH 6/6] We are in 2016

---
 .../src/main/java/com/google/cloud/bigquery/JobStatistics.java  | 2 +-
 .../java/com/google/cloud/bigquery/UserDefinedFunction.java     | 2 +-
 .../cloud/resourcemanager/spi/DefaultResourceManagerRpc.java    | 2 +-
 .../resourcemanager/testing/LocalResourceManagerHelper.java     | 2 +-
 .../resourcemanager/testing/LocalResourceManagerHelperTest.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
index f85ae797a3d3..84f882fb2c53 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java
index d92c1302f05f..36ac2c27485e 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java
index 0eeefd5dd4e5..43cb40bcd306 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java
index 1332f46aa3dc..48934d602bfe 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java
index 1021e2172dae..cfe475cb038b 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.