Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update java template #1367

Merged
merged 4 commits into from
Mar 7, 2022
Merged

chore: update java template #1367

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d93690
chore: update java template
Neenu1995 Mar 7, 2022
c8458e1
chore: fix tests
Neenu1995 Mar 7, 2022
6ddfbfc
chore: fix tests
Neenu1995 Mar 7, 2022
33c42b6
chore: update project
Neenu1995 Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/owlbot/java/templates/poms/bom_pom.xml.j2
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion docker/owlbot/java/tests/new-client/golden/google-cloud-foo-bom/pom.xml
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion docker/owlbot/java/tests/new-version/golden/google-cloud-foo-bom/pom.xml
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion docker/owlbot/java/tests/new-version/input/google-cloud-foo-bom/pom.xml
View file
Open in desktop
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
View file
Open in desktop
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
14 changes: 13 additions & 1 deletion synthtool/gcp/templates/java_library/.github/sync-repo-settings.yaml
View file
Open in desktop
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