Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 40c756d

Browse files
kweinmeistergcf-owl-bot[bot]
kweinmeister
and
gcf-owl-bot[bot]
authored
ci: use Java 11 for samples testing (#505)
* ci: use Java 11 for samples testing * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * ci: Update pom.xml files for Java 11 * ci: Update pom.xml * ci: Update image to Java 11 * ci: revert pom.xml changes * ci: test adding GCF library * ci: fix lint issue * ci: updated samples pom.xml to use Java 11 * ci: Update owlbot.py * ci: Remove temporary changes * ci: Update owlbot to replace pom.xml params * ci: remove unnecessary space * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * ci: revert createagent test * ci: update owlbot.py * ci: changed owlbot exclusion to substitution * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * ci: letting Owlbot change the samples.cfg files * ci: update regex * ci: update to owlbot.py * ci: update to owlbot.py * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent c97b8f4 commit 40c756d

7 files changed

Lines changed: 27 additions & 10 deletions

File tree

‎.kokoro/nightly/samples.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-kokoro-resources/java8"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/samples.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-kokoro-resources/java8"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
77
}
88

99
env_vars: {

‎owlbot.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,24 @@
1818

1919
for library in s.get_staging_dirs():
2020
# put any special-case replacements here
21+
2122
s.move(library)
2223

2324
s.remove_staging_dirs()
2425
java.common_templates()
26+
27+
s.replace(
28+
'**/pom.xml',
29+
r'<maven.compiler.target>1.8</maven.compiler.target>',
30+
r'<maven.compiler.target>11</maven.compiler.target>'
31+
)
32+
s.replace(
33+
'**/pom.xml',
34+
r'<maven.compiler.source>1.8</maven.compiler.source>',
35+
r'<maven.compiler.source>11</maven.compiler.source>'
36+
)
37+
s.replace(
38+
'.kokoro/**/samples.cfg',
39+
r'gcr.io/cloud-devrel-kokoro-resources/java8',
40+
r'gcr.io/cloud-devrel-kokoro-resources/java11'
41+
)

‎samples/install-without-bom/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</parent>
1919

2020
<properties>
21-
<maven.compiler.target>1.8</maven.compiler.target>
22-
<maven.compiler.source>1.8</maven.compiler.source>
21+
<maven.compiler.target>11</maven.compiler.target>
22+
<maven.compiler.source>11</maven.compiler.source>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
</properties>
2525

‎samples/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</parent>
2323

2424
<properties>
25-
<maven.compiler.target>1.8</maven.compiler.target>
26-
<maven.compiler.source>1.8</maven.compiler.source>
25+
<maven.compiler.target>11</maven.compiler.target>
26+
<maven.compiler.source>11</maven.compiler.source>
2727
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2828
</properties>
2929

‎samples/snapshot/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</parent>
1919

2020
<properties>
21-
<maven.compiler.target>1.8</maven.compiler.target>
22-
<maven.compiler.source>1.8</maven.compiler.source>
21+
<maven.compiler.target>11</maven.compiler.target>
22+
<maven.compiler.source>11</maven.compiler.source>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
</properties>
2525

‎samples/snippets/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</parent>
1919

2020
<properties>
21-
<maven.compiler.target>1.8</maven.compiler.target>
22-
<maven.compiler.source>1.8</maven.compiler.source>
21+
<maven.compiler.target>11</maven.compiler.target>
22+
<maven.compiler.source>11</maven.compiler.source>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
</properties>
2525

0 commit comments

Comments
 (0)