Skip to content

Commit e3051c5

Browse files
JoeWang1127JoeWang1127
committed
Merge branch 'main' into diegomarquezp-patch-3
2 parents b6deb96 + 7188522 commit e3051c5

File tree

15 files changed

+116
-24
lines changed

15 files changed

+116
-24
lines changed

‎.github/release-please.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ branches:
1717
- >-
1818
google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java
1919
branch: 3.13.x
20+
- bumpMinorPreMajor: true
21+
handleGHRelease: true
22+
releaseType: java-backport
23+
extraFiles:
24+
- >-
25+
google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java
26+
branch: 3.17.x
2027
extraFiles:
2128
- >-
2229
google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java

‎.github/sync-repo-settings.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,22 @@ branchProtectionRules:
6262
- cla/google
6363
- 'Kokoro - Test: Java GraalVM Native Image'
6464
- 'Kokoro - Test: Java 17 GraalVM Native Image'
65+
- pattern: 3.17.x
66+
isAdminEnforced: true
67+
requiredApprovingReviewCount: 1
68+
requiresCodeOwnerReviews: true
69+
requiresStrictStatusChecks: false
70+
requiredStatusCheckContexts:
71+
- dependencies (17)
72+
- lint
73+
- clirr
74+
- units (8)
75+
- units (11)
76+
- 'Kokoro - Test: Integration'
77+
- cla/google
78+
- 'Kokoro - Test: Java GraalVM Native Image'
79+
- 'Kokoro - Test: Java 17 GraalVM Native Image'
80+
- javadoc
6581
permissionRules:
6682
- team: yoshi-admins
6783
permission: admin

‎.github/workflows/unmanaged_dependency_check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
# repository
1818
.kokoro/build.sh
1919
- name: Unmanaged dependency check
20-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.34.0
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.35.0
2121
with:
2222
bom-path: google-cloud-logging-bom/pom.xml

‎.kokoro/presubmit/graalvm-native-17.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.34.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.35.0"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.34.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.35.0"
77
}
88

99
env_vars: {

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [3.20.2](https://github.com/googleapis/java-logging/compare/v3.20.1...v3.20.2) (2024-09-12)
4+
5+
6+
### Dependencies
7+
8+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.35.0 ([#1683](https://github.com/googleapis/java-logging/issues/1683)) ([31ec2b9](https://github.com/googleapis/java-logging/commit/31ec2b972d5e11e12fe0432f42e3e5b8f23312c6))
9+
310
## [3.20.1](https://github.com/googleapis/java-logging/compare/v3.20.0...v3.20.1) (2024-08-22)
411

512

‎google-cloud-logging-bom/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-logging-bom</artifactId>
6-
<version>3.20.1</version><!-- {x-version-update:google-cloud-logging:current} -->
6+
<version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.34.0</version>
11+
<version>3.35.0</version>
1212
</parent>
1313

1414
<name>Google Cloud logging BOM</name>
@@ -53,17 +53,17 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-logging</artifactId>
56-
<version>3.20.1</version><!-- {x-version-update:google-cloud-logging:current} -->
56+
<version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
5757
</dependency>
5858
<dependency>
5959
<groupId>com.google.api.grpc</groupId>
6060
<artifactId>grpc-google-cloud-logging-v2</artifactId>
61-
<version>0.109.1</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
61+
<version>0.109.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
6262
</dependency>
6363
<dependency>
6464
<groupId>com.google.api.grpc</groupId>
6565
<artifactId>proto-google-cloud-logging-v2</artifactId>
66-
<version>0.109.1</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
66+
<version>0.109.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
6767
</dependency>
6868
</dependencies>
6969
</dependencyManagement>

‎google-cloud-logging/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-logging</artifactId>
6-
<version>3.20.1</version><!-- {x-version-update:google-cloud-logging:current} -->
6+
<version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
77
<packaging>jar</packaging>
88
<name>Google Cloud Logging</name>
99
<url>https://github.com/googleapis/java-logging</url>
1010
<description>Java idiomatic client for Cloud Logging</description>
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-logging-parent</artifactId>
14-
<version>3.20.1</version><!-- {x-version-update:google-cloud-logging:current} -->
14+
<version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-logging</site.installationModule>

‎google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public final class Instrumentation {
4040
// See
4141
// https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files
4242
// {x-version-update-start:google-cloud-logging:current}
43-
public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.20.1";
43+
public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.20.3-SNAPSHOT";
4444
// {x-version-update-end}
4545
public static final String INSTRUMENTATION_LOG_NAME = "diagnostic-log";
4646
public static final int MAX_DIAGNOSTIC_VALUE_LENGTH = 14;

‎grpc-google-cloud-logging-v2/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>grpc-google-cloud-logging-v2</artifactId>
7-
<version>0.109.1</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
7+
<version>0.109.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
88
<name>grpc-google-cloud-logging-v2</name>
99
<description>GRPC library for grpc-google-cloud-logging-v2</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-logging-parent</artifactId>
13-
<version>3.20.1</version><!-- {x-version-update:google-cloud-logging:current} -->
13+
<version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

0 commit comments

Comments
 (0)