steffnay
diff --git a/‎generation/consolidate_config.sh‎
Lines changed: 8 additions & 0 deletions b/‎generation/consolidate_config.sh‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎google-cloud-jar-parent/pom.xml‎
Lines changed: 21 additions & 0 deletions b/‎google-cloud-jar-parent/pom.xml‎
Lines changed: 21 additions & 0 deletions
diff --git a/‎google-cloud-pom-parent/pom.xml‎
Lines changed: 30 additions & 0 deletions b/‎google-cloud-pom-parent/pom.xml‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎java-accessapproval/google-cloud-accessapproval-bom/pom.xml‎
Lines changed: 0 additions & 12 deletions b/‎java-accessapproval/google-cloud-accessapproval-bom/pom.xml‎
Lines changed: 0 additions & 12 deletions
diff --git a/‎java-accessapproval/google-cloud-accessapproval/pom.xml‎
Lines changed: 0 additions & 24 deletions b/‎java-accessapproval/google-cloud-accessapproval/pom.xml‎
Lines changed: 0 additions & 24 deletions
diff --git a/‎java-accessapproval/grpc-google-cloud-accessapproval-v1/pom.xml‎
Lines changed: 0 additions & 24 deletions b/‎java-accessapproval/grpc-google-cloud-accessapproval-v1/pom.xml‎
Lines changed: 0 additions & 24 deletions
diff --git a/‎java-accessapproval/pom.xml‎
Lines changed: 0 additions & 17 deletions b/‎java-accessapproval/pom.xml‎
Lines changed: 0 additions & 17 deletions
diff --git a/‎java-accessapproval/proto-google-cloud-accessapproval-v1/pom.xml‎
Lines changed: 0 additions & 9 deletions b/‎java-accessapproval/proto-google-cloud-accessapproval-v1/pom.xml‎
Lines changed: 0 additions & 9 deletions
diff --git a/‎java-accesscontextmanager/google-identity-accesscontextmanager-bom/pom.xml‎
Lines changed: 0 additions & 12 deletions b/‎java-accesscontextmanager/google-identity-accesscontextmanager-bom/pom.xml‎
Lines changed: 0 additions & 12 deletions
diff --git a/‎java-accesscontextmanager/google-identity-accesscontextmanager/pom.xml‎
Lines changed: 0 additions & 24 deletions b/‎java-accesscontextmanager/google-identity-accesscontextmanager/pom.xml‎
Lines changed: 0 additions & 24 deletions
@@ -56,6 +56,12 @@ function removeElement {
   runRegexOnPoms "$perl_command" "<${element}>"
 }
 
+function setGrafeasCheckstyleHeaderConfig {
+  perl_command="s/(\s*<properties>\s*.*?)(\s*<checkstyle.header.file>grafeas.header<\/checkstyle.header.file>)?(\s*<\/properties>)/\$1\n    <checkstyle.header.file>grafeas.header<\/checkstyle.header.file>\$3/s"
+  runRegexOnPoms "$perl_command" ">Grafeas Client<"
+}
+
+setGrafeasCheckstyleHeaderConfig
 removeManagedDependency 'google-cloud-shared-dependencies'
 removeManagedDependency 'junit'
 removeManagedDependency 'joda-time'
@@ -72,7 +78,9 @@ removeElement 'organization'
 removeElement 'scm'
 removeElement 'issueManagement'
 removeElement 'licenses'
+removeElement 'profiles'
 removeElement 'junit.version'
+removeElement 'build'
 removeElement 'url'
 removeArtifact 'plugin' 'nexus-staging-maven-plugin' 'plugins'
 removeArtifact 'dependency' 'checkstyle' 'plugins'
 
@@ -121,6 +121,23 @@
     </dependencies>
   </dependencyManagement>
 
+  <profiles>
+    <profile>
+      <id>java9</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <dependencies>
+        <!-- needed for @Generated annotation at compile-time -->
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
   <build>
     <plugins>
       <!-- jacoco code coverage -->
@@ -158,6 +175,10 @@
           <reuseForks>true</reuseForks>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
 
@@ -21,6 +21,7 @@
 
   <properties>
     <skipUnitTests>false</skipUnitTests>
+    <checkstyle.header.file>java.header</checkstyle.header.file>
   </properties>
 
   <developers>
@@ -56,4 +57,33 @@
     </license>
   </licenses>
 
+  <profiles>
+    <profile>
+      <!-- Only run checkstyle plugin on Java 11+ (checkstyle artifact only supports Java 11+) -->
+      <id>checkstyle-tests</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>checkstyle</id>
+                <phase>validate</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+                <configuration>
+                  <headerLocation>${checkstyle.header.file}</headerLocation>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
@@ -37,16 +37,4 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
@@ -96,28 +96,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <profiles>
-    <profile>
-      <id>java9</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
-  <build>
-    <plugins>
-      <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>flatten-maven-plugin</artifactId>
-        </plugin>
-    </plugins>
-  </build>
 </project>
@@ -38,28 +38,4 @@
       <artifactId>guava</artifactId>
     </dependency>
   </dependencies>
-
-  <profiles>
-    <profile>
-      <id>java9</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
-  <build>
-    <plugins>
-      <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>flatten-maven-plugin</artifactId>
-        </plugin>
-    </plugins>
-  </build>
 </project>
@@ -46,23 +46,6 @@
     </dependencies>
   </dependencyManagement>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <configuration>
-            <ignoredUnusedDeclaredDependencies>
-              <ignoredUnusedDeclaredDependency>org.objenesis:objenesis</ignoredUnusedDeclaredDependency>
-              <ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
-            </ignoredUnusedDeclaredDependencies>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
   <modules>
     <module>google-cloud-accessapproval</module>
     <module>grpc-google-cloud-accessapproval-v1</module>
 
@@ -30,13 +30,4 @@
       <artifactId>guava</artifactId>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>flatten-maven-plugin</artifactId>
-        </plugin>
-    </plugins>
-  </build>
 </project>
@@ -46,16 +46,4 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
@@ -98,28 +98,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <profiles>
-    <profile>
-      <id>java9</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
-  <build>
-    <plugins>
-      <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>flatten-maven-plugin</artifactId>
-        </plugin>
-    </plugins>
-  </build>
 </project>