diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index eb9374963..40af80ae7 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -18,10 +18,6 @@
     <module name="NewlineAtEndOfFile"> <!-- Java Style Guide: Line ending: LF -->
         <property name="lineSeparator" value="lf"/>
     </module>
-    <module name="RegexpHeader">
-        <property name="header" value="^/\*$\n^ \* \(c\) Copyright \d{4} Palantir Technologies Inc\. All rights reserved\.$"/>
-        <property name="fileExtensions" value=".java,.ts"/>
-    </module>
     <module name="RegexpMultiline"> <!-- Development Practices: Writing good unit tests -->
         <property name="fileExtensions" value="java"/>
         <property name="format" value="@VisibleForTesting\s+(protected|public)"/>
@@ -247,7 +243,6 @@
             <message key="name.invalidPattern" value="Package name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="ParameterAssignment"/> <!-- Java Coding Guidelines: Final variables and parameters -->
-        <module name="ParenPad"/> <!-- Java Style Guide: Horizontal whitespace -->
         <module name="RedundantImport"/> <!-- Java Style Guide: No unused imports -->
         <module name="RedundantModifier"/> <!-- Java Coding Guidelines: Avoid redundant modifiers -->
         <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
diff --git a/build.gradle b/build.gradle
index 2114d9609..9c104eec6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-info-plugin:6.0.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:17.0.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:3.1.1'
+        classpath 'com.palantir.baseline:gradle-baseline-java:3.4.2'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.17.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0'
diff --git a/conjure-java-client-verifier/src/test/java/com/palantir/conjure/java/compliance/VerificationServerRule.java b/conjure-java-client-verifier/src/test/java/com/palantir/conjure/java/compliance/VerificationServerRule.java
index de9650d33..96ba8e27b 100644
--- a/conjure-java-client-verifier/src/test/java/com/palantir/conjure/java/compliance/VerificationServerRule.java
+++ b/conjure-java-client-verifier/src/test/java/com/palantir/conjure/java/compliance/VerificationServerRule.java
@@ -1,5 +1,17 @@
 /*
  * (c) Copyright 2018 Palantir Technologies 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.palantir.conjure.java.compliance;
diff --git a/conjure-java-core/src/main/java/com/palantir/conjure/java/visitor/DefaultTypeVisitor.java b/conjure-java-core/src/main/java/com/palantir/conjure/java/visitor/DefaultTypeVisitor.java
index 9f141909f..c3084b878 100644
--- a/conjure-java-core/src/main/java/com/palantir/conjure/java/visitor/DefaultTypeVisitor.java
+++ b/conjure-java-core/src/main/java/com/palantir/conjure/java/visitor/DefaultTypeVisitor.java
@@ -1,5 +1,17 @@
 /*
  * (c) Copyright 2019 Palantir Technologies 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.palantir.conjure.java.visitor;
diff --git a/conjure-java-core/src/main/java/com/palantir/conjure/java/visitor/MoreVisitors.java b/conjure-java-core/src/main/java/com/palantir/conjure/java/visitor/MoreVisitors.java
index 943d4704f..3c3d06c50 100644
--- a/conjure-java-core/src/main/java/com/palantir/conjure/java/visitor/MoreVisitors.java
+++ b/conjure-java-core/src/main/java/com/palantir/conjure/java/visitor/MoreVisitors.java
@@ -1,5 +1,17 @@
 /*
  * (c) Copyright 2019 Palantir Technologies 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.palantir.conjure.java.visitor;
diff --git a/conjure-java-core/src/test/java/com/palantir/conjure/java/types/BeanSerdeIntegrationTests.java b/conjure-java-core/src/test/java/com/palantir/conjure/java/types/BeanSerdeIntegrationTests.java
index 8c5144b38..68b7f508d 100644
--- a/conjure-java-core/src/test/java/com/palantir/conjure/java/types/BeanSerdeIntegrationTests.java
+++ b/conjure-java-core/src/test/java/com/palantir/conjure/java/types/BeanSerdeIntegrationTests.java
@@ -1,5 +1,17 @@
 /*
  * (c) Copyright 2018 Palantir Technologies 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.palantir.conjure.java.types;
diff --git a/conjure-java-core/src/test/java/com/palantir/conjure/java/types/MissingFieldWireFormatTests.java b/conjure-java-core/src/test/java/com/palantir/conjure/java/types/MissingFieldWireFormatTests.java
index 289838fa1..8067953bc 100644
--- a/conjure-java-core/src/test/java/com/palantir/conjure/java/types/MissingFieldWireFormatTests.java
+++ b/conjure-java-core/src/test/java/com/palantir/conjure/java/types/MissingFieldWireFormatTests.java
@@ -1,5 +1,17 @@
 /*
  * (c) Copyright 2018 Palantir Technologies 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.palantir.conjure.java.types;
diff --git a/conjure-java-core/src/test/java/com/palantir/conjure/java/types/NullFieldWireFormatTests.java b/conjure-java-core/src/test/java/com/palantir/conjure/java/types/NullFieldWireFormatTests.java
index f43ebeb09..7c636d419 100644
--- a/conjure-java-core/src/test/java/com/palantir/conjure/java/types/NullFieldWireFormatTests.java
+++ b/conjure-java-core/src/test/java/com/palantir/conjure/java/types/NullFieldWireFormatTests.java
@@ -1,5 +1,17 @@
 /*
  * (c) Copyright 2018 Palantir Technologies 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.palantir.conjure.java.types;
diff --git a/conjure-java-core/src/test/java/com/palantir/conjure/java/types/ObjectGeneratorTests.java b/conjure-java-core/src/test/java/com/palantir/conjure/java/types/ObjectGeneratorTests.java
index b8464c636..0503f0164 100644
--- a/conjure-java-core/src/test/java/com/palantir/conjure/java/types/ObjectGeneratorTests.java
+++ b/conjure-java-core/src/test/java/com/palantir/conjure/java/types/ObjectGeneratorTests.java
@@ -1,5 +1,17 @@
 /*
  * (c) Copyright 2018 Palantir Technologies 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.palantir.conjure.java.types;
diff --git a/conjure-java-core/src/test/java/com/palantir/conjure/java/types/WireFormatTests.java b/conjure-java-core/src/test/java/com/palantir/conjure/java/types/WireFormatTests.java
index 620eb4aa3..6f5a7a18c 100644
--- a/conjure-java-core/src/test/java/com/palantir/conjure/java/types/WireFormatTests.java
+++ b/conjure-java-core/src/test/java/com/palantir/conjure/java/types/WireFormatTests.java
@@ -1,5 +1,17 @@
 /*
  * (c) Copyright 2018 Palantir Technologies 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.palantir.conjure.java.types;