Skip to content

Commit

Permalink
chore: update java template (#1367)
Browse files Browse the repository at this point in the history
* chore: update java template

* chore: fix tests

* chore: fix tests

* chore: update project
  • Loading branch information
Neenu1995 authored Mar 7, 2022
1 parent 38e11ad commit 1155a97
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 19 deletions.
2 changes: 1 addition & 1 deletion docker/owlbot/java/templates/poms/bom_pom.xml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/templates/poms/parent_pom.xml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/tests/fix-poms/golden/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/tests/fix-poms/input/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/tests/new-client/golden/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/tests/new-version/golden/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/tests/new-version/input/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down

0 comments on commit 1155a97

Please sign in to comment.