chore: update java template (#1367)

* chore: update java template * chore: fix tests * chore: fix tests * chore: update project
googleapis · Mar 7, 2022 · 1155a97 · 1155a97
1 parent 38e11ad
commit 1155a97
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 19 deletions.
diff --git a/docker/owlbot/java/templates/poms/bom_pom.xml.j2 b/docker/owlbot/java/templates/poms/bom_pom.xml.j2
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.7</version>
   </parent>
 
   <name>Google {{name}} BOM</name>

diff --git a/docker/owlbot/java/templates/poms/parent_pom.xml.j2 b/docker/owlbot/java/templates/poms/parent_pom.xml.j2
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.7</version>
   </parent>
 
   <developers>
@@ -75,7 +75,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>2.4.0</version>
+        <version>2.8.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/docker/owlbot/java/tests/fix-poms/golden/pom.xml b/docker/owlbot/java/tests/fix-poms/golden/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.7</version>
   </parent>
 
   <developers>
@@ -90,7 +90,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>2.4.0</version>
+        <version>2.8.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/docker/owlbot/java/tests/fix-poms/input/pom.xml b/docker/owlbot/java/tests/fix-poms/input/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.7</version>
   </parent>
 
   <developers>
@@ -90,7 +90,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>2.4.0</version>
+        <version>2.8.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/docker/owlbot/java/tests/new-client/golden/google-cloud-foo-bom/pom.xml b/docker/owlbot/java/tests/new-client/golden/google-cloud-foo-bom/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.7</version>
   </parent>
 
   <name>Google Example API BOM</name>

diff --git a/docker/owlbot/java/tests/new-client/golden/pom.xml b/docker/owlbot/java/tests/new-client/golden/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.7</version>
   </parent>
 
   <developers>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>2.4.0</version>
+        <version>2.8.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/docker/owlbot/java/tests/new-version/golden/google-cloud-foo-bom/pom.xml b/docker/owlbot/java/tests/new-version/golden/google-cloud-foo-bom/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.7</version>
   </parent>
 
   <name>Google Example API BOM</name>

diff --git a/docker/owlbot/java/tests/new-version/golden/pom.xml b/docker/owlbot/java/tests/new-version/golden/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.7</version>
   </parent>
 
   <developers>
@@ -95,7 +95,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>2.4.0</version>
+        <version>2.8.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/docker/owlbot/java/tests/new-version/input/google-cloud-foo-bom/pom.xml b/docker/owlbot/java/tests/new-version/input/google-cloud-foo-bom/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.7</version>
   </parent>
 
   <name>Google Example API BOM</name>

diff --git a/docker/owlbot/java/tests/new-version/input/pom.xml b/docker/owlbot/java/tests/new-version/input/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.7</version>
   </parent>
 
   <developers>
@@ -85,7 +85,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>2.4.0</version>
+        <version>2.8.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/synthtool/gcp/templates/java_library/.github/sync-repo-settings.yaml b/synthtool/gcp/templates/java_library/.github/sync-repo-settings.yaml
@@ -1,4 +1,16 @@
-
+# Copyright 2022 Google 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
+#
+#      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.
 # Whether or not rebase-merging is enabled on this repository.
 # Defaults to `true`
 rebaseMergeAllowed: false

diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg
@@ -13,12 +13,12 @@ env_vars: {
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
-  value: "gcloud-devel"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {