Skip to content

Commit 44b7b2f

Browse files
committed
Merge branch 'main' of github.com:googleapis/google-http-java-client
2 parents 9b67351 + c82f6d3 commit 44b7b2f

File tree

9 files changed

+49
-10
lines changed

9 files changed

+49
-10
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
16-
digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813
17-
# created: 2022-04-06T16:30:03.627422514Z
16+
digest: sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74
17+
# created: 2022-05-19T15:12:45.278246753Z

.kokoro/build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ graalvm)
7474
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
7575
RETURN_CODE=$?
7676
;;
77+
graalvm17)
78+
# Run Unit and Integration Tests with Native Image
79+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
80+
RETURN_CODE=$?
81+
;;
7782
samples)
7883
SAMPLES_DIR=samples
7984
# only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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/graalvm17"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "graalvm17"
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+
}

docs/setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`:
2323
<dependency>
2424
<groupId>com.google.cloud</groupId>
2525
<artifactId>libraries-bom</artifactId>
26-
<version>25.1.0</version>
26+
<version>25.4.0</version>
2727
<type>pom</type>
2828
<scope>import</scope>
2929
</dependency>

google-http-client-apache-v2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<plugin>
6969
<groupId>org.apache.felix</groupId>
7070
<artifactId>maven-bundle-plugin</artifactId>
71-
<version>5.1.4</version>
71+
<version>5.1.6</version>
7272
<executions>
7373
<execution>
7474
<id>bundle-manifest</id>

google-http-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<plugin>
9090
<groupId>org.apache.felix</groupId>
9191
<artifactId>maven-bundle-plugin</artifactId>
92-
<version>5.1.4</version>
92+
<version>5.1.6</version>
9393
<executions>
9494
<execution>
9595
<id>bundle-manifest</id>

google-http-client/src/main/java/com/google/api/client/util/IOUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ public static <S extends Serializable> S deserialize(InputStream inputStream) th
179179
* @since 1.16
180180
* @deprecated use java.nio.file.Path#isSymbolicLink
181181
*/
182+
@Deprecated
182183
public static boolean isSymbolicLink(File file) throws IOException {
183184
// first try using Java 7
184185
try {

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>com.google.errorprone</groupId>
127127
<artifactId>error_prone_annotations</artifactId>
128-
<version>2.13.1</version>
128+
<version>2.14.0</version>
129129
</dependency>
130130
<dependency>
131131
<groupId>com.google.appengine</groupId>
@@ -526,12 +526,12 @@
526526
- Internally, update the default features.json file
527527
-->
528528
<project.http-client.version>1.41.8</project.http-client.version><!-- {x-version-update:google-http-client-parent:current} -->
529-
<project.appengine.version>2.0.4</project.appengine.version>
529+
<project.appengine.version>2.0.5</project.appengine.version>
530530
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
531531
<project.jsr305.version>3.0.2</project.jsr305.version>
532532
<project.gson.version>2.9.0</project.gson.version>
533-
<project.jackson-core2.version>2.13.2</project.jackson-core2.version>
534-
<project.protobuf-java.version>3.20.1</project.protobuf-java.version>
533+
<project.jackson-core2.version>2.13.3</project.jackson-core2.version>
534+
<project.protobuf-java.version>3.21.0</project.protobuf-java.version>
535535
<project.guava.version>30.1.1-android</project.guava.version>
536536
<project.xpp3.version>1.1.4c</project.xpp3.version>
537537
<project.httpclient.version>4.5.13</project.httpclient.version>

samples/snippets/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.cloud</groupId>
3333
<artifactId>libraries-bom</artifactId>
34-
<version>25.2.0</version>
34+
<version>25.3.0</version>
3535
<type>pom</type>
3636
<scope>import</scope>
3737
</dependency>

0 commit comments

Comments
 (0)