chore: Changes for release job (googleapis#1199)

* chore: Changes for release job
mpeddada1 · Jan 5, 2023 · 0fb58e0 · 0fb58e0
1 parent 8c5e17b
commit 0fb58e0
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 10 deletions.
diff --git a/.github/workflows/ci-maven.yaml b/.github/workflows/ci-maven.yaml
@@ -75,22 +75,20 @@ jobs:
           java-version: 11
           distribution: temurin
           cache: maven
-      - name: Install modules outside gapic-generator-java
+      - name: Install all modules using Java 11
         shell: bash
         run: |
-          mvn -B -ntp install --projects '!gapic-generator-java' \
-              -Dcheckstyle.skip -Dfmt.skip -DskipTests
+          mvn -V -B -ntp clean install -DskipTests
       - uses: actions/setup-java@v3
         with:
           java-version: 8
           distribution: temurin
           cache: maven
       - run: java -version
-      - name: Run test only for gapic-generator-java using Java 8
+      - name: Run tests in Java 8 with the source compiled in Java 11 for gapic-generator-java
         shell: bash
         run: |
-          mvn -B -ntp verify --projects 'gapic-generator-java' \
-              -Dcheckstyle.skip -Dfmt.skip
+          mvn -V -B -ntp surefire:test --projects 'gapic-generator-java'
 
   lint:
     runs-on: ubuntu-latest

diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg
@@ -9,7 +9,7 @@ build_file: "gapic-generator-java/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
 }
 
 before_action {

diff --git a/api-common-java/license-checks.xml b/api-common-java/license-checks.xml
@@ -5,6 +5,6 @@
 <module name="Checker">
   <module name="RegexpHeader">
     <property name="fileExtensions" value="java"/>
-    <property name="headerFile" value="java.header"/>
+    <property name="headerFile" value="./api-common-java/java.header"/>
   </module>
 </module>
diff --git a/gapic-generator-java-pom-parent/java.header b/gapic-generator-java-pom-parent/java.header
@@ -0,0 +1,15 @@
+^/\*$
+^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)$
+^ \*$
+^ \* 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$
+^ \*$
+^ \*[ ]+https?://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\.$
+^ \*/$
diff --git a/gapic-generator-java-pom-parent/license-checks.xml b/gapic-generator-java-pom-parent/license-checks.xml
@@ -0,0 +1,10 @@
+<?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="RegexpHeader">
+    <property name="fileExtensions" value="java"/>
+    <property name="headerFile" value="${checkstyle.header.file}"/>
+  </module>
+</module>
diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
@@ -31,6 +31,7 @@
     <gson.version>2.10</gson.version>
     <guava.version>31.1-jre</guava.version>
     <protobuf.version>3.21.12</protobuf.version>
+    <maven.compiler.release>8</maven.compiler.release>
   </properties>
 
   <developers>

diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml
@@ -5,6 +5,7 @@
   <groupId>com.google.api</groupId>
   <artifactId>gapic-generator-java</artifactId>
   <version>2.12.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
+  <name>GAPIC Generator Java</name>
 
   <properties>
     <checkstyle.skip>true</checkstyle.skip>

diff --git a/gax-java/license-checks.xml b/gax-java/license-checks.xml
@@ -5,6 +5,6 @@
 <module name="Checker">
   <module name="RegexpHeader">
     <property name="fileExtensions" value="java"/>
-    <property name="headerFile" value="java.header"/>
+    <property name="headerFile" value="./gax-java/java.header"/>
   </module>
 </module>
diff --git a/java-iam/license-checks.xml b/java-iam/license-checks.xml
@@ -5,6 +5,6 @@
 <module name="Checker">
   <module name="RegexpHeader">
     <property name="fileExtensions" value="java"/>
-    <property name="headerFile" value="${checkstyle.header.file}"/>
+    <property name="headerFile" value="./java-iam/java.header"/>
   </module>
 </module>