Skip to content

Commit d08aed0

Browse files
jinseopkim0jinseopkim0
committed
chore(shared-config): address PR review feedback, fix vintage junit test discovery, and restore logback Kokoro configs
1 parent f850ff9 commit d08aed0

9 files changed

Lines changed: 95 additions & 16 deletions

File tree

‎.github/workflows/java-shared-config-downstream-dependencies.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
branches:
44
- main
55
pull_request:
6-
name: java-shared-config downstream
6+
name: java-shared-config downstream (dependencies)
77
env:
88
BUILD_SUBDIR: java-shared-config
99
jobs:

‎.github/workflows/java-shared-config-downstream-maven-plugins.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
# Keeping this file separate as the dependencies check would use more
88
# repositories than needed this downstream check for GraalVM native image and
99
# other Maven plugins.
10-
name: java-shared-config downstream
10+
name: java-shared-config downstream (maven-plugins)
1111
env:
1212
BUILD_SUBDIR: java-shared-config
1313
jobs:

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.56.1"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "graalvm-single"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-it-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-it-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "BUILD_SUBDIR"
37+
value: "java-logging-logback"
38+
}

‎.kokoro/presubmit/logging-logback-integration.cfg‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration-single"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-it-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-it-service-account"
33+
}
34+
35+
36+
env_vars: {
37+
key: "BUILD_SUBDIR"
38+
value: "java-logging-logback"
39+
}

‎java-shared-config/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ Apache 2.0 - See [LICENSE][license] for more information.
5555

5656
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-shared-config.svg
5757
[maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-shared-config&core=gav
58-
[contributing]: https://github.com/googleapis/java-shared-config/blob/main/CONTRIBUTING.md
59-
[code-of-conduct]: https://github.com/googleapis/java-shared-config/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
60-
[license]: https://github.com/googleapis/java-shared-config/blob/main/LICENSE
58+
[contributing]: https://github.com/googleapis/google-cloud-java/blob/main/CONTRIBUTING.md
59+
[code-of-conduct]: https://github.com/googleapis/google-cloud-java/blob/main/CODE_OF_CONDUCT.md
60+
[license]: https://github.com/googleapis/google-cloud-java/blob/main/LICENSE

‎java-shared-config/java-shared-config/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<packaging>pom</packaging>
99
<version>1.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-config:current} -->
1010
<name>Google Cloud Shared Config</name>
11-
<url>https://github.com/googleapis/java-shared-config</url>
11+
<url>https://github.com/googleapis/google-cloud-java</url>
1212
<description>
1313
Shared build configuration for Google Cloud Java libraries.
1414
</description>

‎java-shared-config/native-image-shared-config/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<packaging>pom</packaging>
99
<version>1.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-config:current} -->
1010
<name>Native Image Shared Config</name>
11-
<url>https://github.com/googleapis/java-shared-config</url>
11+
<url>https://github.com/googleapis/google-cloud-java</url>
1212
<description>
1313
Native Image build configuration for Google Cloud Java libraries.
1414
</description>
@@ -26,15 +26,16 @@
2626
<organization>
2727
<name>Google LLC</name>
2828
</organization>
29-
<scm>
30-
<connection>scm:git:git@github.com:googleapis/java-shared-config.git</connection>
31-
<developerConnection>scm:git:git@github.com:googleapis/java-shared-config.git</developerConnection>
32-
<url>https://github.com/googleapis/java-shared-config</url>
29+
<scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false"
30+
child.scm.url.inherit.append.path="false">
31+
<connection>scm:git:git@github.com:googleapis/google-cloud-java.git</connection>
32+
<developerConnection>scm:git:git@github.com:googleapis/google-cloud-java.git</developerConnection>
33+
<url>https://github.com/googleapis/google-cloud-java</url>
3334
<tag>HEAD</tag>
3435
</scm>
3536

3637
<issueManagement>
37-
<url>https://github.com/googleapis/java-shared-config/issues</url>
38+
<url>https://github.com/googleapis/google-cloud-java/issues</url>
3839
<system>GitHub Issues</system>
3940
</issueManagement>
4041

@@ -60,7 +61,7 @@
6061
<surefire.version>3.5.2</surefire.version>
6162
<graal-sdk-nativeimage.version>25.0.0</graal-sdk-nativeimage.version>
6263
<native-maven-plugin.version>0.10.6</native-maven-plugin.version>
63-
<junit-vintage-engine.version>5.14.3</junit-vintage-engine.version>
64+
<junit-vintage-engine.version>5.11.4</junit-vintage-engine.version>
6465
<opentest4j.version>1.3.0</opentest4j.version>
6566
<ignoredDependencies>org.graalvm.sdk:nativeimage</ignoredDependencies>
6667
</properties>

‎sdk-platform-java/gapic-generator-java-pom-parent/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<parent>
1616
<groupId>com.google.cloud</groupId>
1717
<artifactId>google-cloud-shared-config</artifactId>
18-
<version>1.17.0</version>
18+
<version>1.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-config:current} -->
19+
<relativePath>../../java-shared-config/java-shared-config/pom.xml</relativePath>
1920
</parent>
2021

2122
<properties>

‎sdk-platform-java/sdk-platform-java-config/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<parent>
1414
<groupId>com.google.cloud</groupId>
1515
<artifactId>google-cloud-shared-config</artifactId>
16-
<version>1.17.0</version>
17-
<relativePath/>
16+
<version>1.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-config:current} -->
17+
<relativePath>../../java-shared-config/java-shared-config/pom.xml</relativePath>
1818
</parent>
1919

2020
<properties>

0 commit comments

Comments
 (0)