Skip to content

Commit 9df1cd7

Browse files
authored
fix: new java format dependencies and linter fix (#768)
This fixes three current build issues due to version updates: 1. java-format got additional dependencies starting version 1.9: **auto-value-annotations** and **auto-service-annotations** 2. java-format requires JRE v11+ to run. Updating ci.yaml for that. google/google-java-format#529 3. Guava drops java7 support from v31, therefore disabling unit tests for java7
1 parent 2c90edd commit 9df1cd7

File tree

5 files changed

+25
-11
lines changed

5 files changed

+25
-11
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker:
2-
image: gcr.io/repo-automation-bots/owlbot-java:latest
3-
digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa
2+
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
3+
digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75

.github/sync-repo-settings.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ branchProtectionRules:
99
requiresStrictStatusChecks: false
1010
requiredStatusCheckContexts:
1111
- checkstyle
12-
- units (7)
1312
- units (8)
1413
- units (11)
1514
- dependencies (8)
@@ -24,7 +23,6 @@ branchProtectionRules:
2423
requiresStrictStatusChecks: false
2524
requiredStatusCheckContexts:
2625
- checkstyle
27-
- units (7)
2826
- units (8)
2927
- units (11)
3028
- dependencies (8)

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [7, 8, 11]
12+
java: [8, 11, 17]
1313
steps:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-java@v1
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
26-
java: [8, 11]
26+
java: [8, 11, 17]
2727
steps:
2828
- uses: actions/checkout@v2
2929
- uses: actions/setup-java@v1
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/checkout@v2
5151
- uses: actions/setup-java@v1
5252
with:
53-
java-version: 8
53+
java-version: 11
5454
- run: java -version
5555
- run: .kokoro/build.sh
5656
env:

.kokoro/release/publish_javadoc11.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,13 @@ mvn clean install -B -q -DskipTests=true
3636
export NAME=google-oauth-client
3737
export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
3838

39-
# cloud RAD generation
40-
mvn clean javadoc:aggregate -B -q -P docFX
41-
# include CHANGELOG
39+
# V3 generates docfx yml from javadoc
40+
# generate yml
41+
mvn clean site -B -q -P docFX
42+
43+
# copy README to docfx-yml dir and rename index.md
44+
cp README.md target/docfx-yml/index.md
45+
# copy CHANGELOG to docfx-yml dir and rename history.md
4246
cp CHANGELOG.md target/docfx-yml/history.md
4347

4448
pushd target/docfx-yml

pom.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,16 @@
174174
<artifactId>datanucleus-rdbms</artifactId>
175175
<version>${project.datanucleus-rdbms.version}</version>
176176
</dependency>
177+
<dependency>
178+
<groupId>com.google.auto.service</groupId>
179+
<artifactId>${project.auto-service-annotations.version}</artifactId>
180+
<version>1.0</version>
181+
</dependency>
182+
<dependency>
183+
<groupId>com.google.auto.value</groupId>
184+
<artifactId>${project.auto-value-annotations.version}</artifactId>
185+
<version>1.8.2</version>
186+
</dependency>
177187
</dependencies>
178188
</dependencyManagement>
179189

@@ -463,7 +473,7 @@
463473
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
464474
<project.http.version>1.40.1</project.http.version>
465475
<project.jsr305.version>3.0.2</project.jsr305.version>
466-
<project.guava.version>30.1-android</project.guava.version>
476+
<project.guava.version>31.0-android</project.guava.version>
467477
<project.xpp3.version>1.1.4c</project.xpp3.version>
468478
<project.commons-logging.version>1.1.1</project.commons-logging.version>
469479
<project.jdo2-api.version>2.3-eb</project.jdo2-api.version>
@@ -473,6 +483,8 @@
473483
<project.datanucleus-rdbms.version>3.2.13</project.datanucleus-rdbms.version>
474484
<project.datanucleus-maven-plugin.version>4.0.5</project.datanucleus-maven-plugin.version>
475485
<project.servlet-api.version>2.5</project.servlet-api.version>
486+
<project.auto-value-annotations.version>1.8.2</project.auto-value-annotations.version>
487+
<project.auto-service-annotations.version>1.0</project.auto-service-annotations.version>
476488
<deploy.autorelease>false</deploy.autorelease>
477489
</properties>
478490

0 commit comments

Comments
 (0)