Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: new java format dependencies and linter fix #768

Merged
merged 12 commits into from
Nov 9, 2021
Merged

fix: new java format dependencies and linter fix #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d821dcc
java format with deps
TimurSadykov Nov 5, 2021
c4915cb
java format dependencies
TimurSadykov Nov 6, 2021
59fa46a
java format version fix
TimurSadykov Nov 6, 2021
e02368d
bump lint jre version
TimurSadykov Nov 7, 2021
61e582d
java format version fix
TimurSadykov Nov 7, 2021
0806341
fix: remove unnecessary versions
TimurSadykov Nov 7, 2021
184729e
chore: update Guava version
TimurSadykov Nov 7, 2021
5f94c2e
chore: disable unit tests for java7
TimurSadykov Nov 7, 2021
24a2be7
chore: remove tests for java7 from required
TimurSadykov Nov 7, 2021
a98a093
fix: fix owl bot
TimurSadykov Nov 9, 2021
eeb5d68
Merge branch 'main' into stim-build-test
TimurSadykov Nov 9, 2021
edc69b6
🦉 Updates from OwlBot
gcf-owl-bot[bot] Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/.OwlBot.lock.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
docker:
image: gcr.io/repo-automation-bots/owlbot-java:latest
digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75
2 changes: 0 additions & 2 deletions .github/sync-repo-settings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ branchProtectionRules:
requiresStrictStatusChecks: false
requiredStatusCheckContexts:
- checkstyle
- units (7)
- units (8)
- units (11)
- dependencies (8)
Expand All @@ -24,7 +23,6 @@ branchProtectionRules:
requiresStrictStatusChecks: false
requiredStatusCheckContexts:
- checkstyle
- units (7)
- units (8)
- units (11)
- dependencies (8)
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [7, 8, 11]
java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
Expand All @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [8, 11]
java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
Expand All @@ -50,7 +50,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: 8
java-version: 11
- run: java -version
- run: .kokoro/build.sh
env:
Expand Down
10 changes: 7 additions & 3 deletions .kokoro/release/publish_javadoc11.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,13 @@ mvn clean install -B -q -DskipTests=true
export NAME=google-oauth-client
export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)

# cloud RAD generation
mvn clean javadoc:aggregate -B -q -P docFX
# include CHANGELOG
# V3 generates docfx yml from javadoc
# generate yml
mvn clean site -B -q -P docFX

# copy README to docfx-yml dir and rename index.md
cp README.md target/docfx-yml/index.md
# copy CHANGELOG to docfx-yml dir and rename history.md
cp CHANGELOG.md target/docfx-yml/history.md

pushd target/docfx-yml
Expand Down
14 changes: 13 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,16 @@
<artifactId>datanucleus-rdbms</artifactId>
<version>${project.datanucleus-rdbms.version}</version>
</dependency>
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>${project.auto-service-annotations.version}</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>${project.auto-value-annotations.version}</artifactId>
<version>1.8.2</version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be ${project.auto-service-annotations.version}?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, the whole thing seems wrong. I'm surprised this doesn't fail.

</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -463,7 +473,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.http.version>1.40.1</project.http.version>
<project.jsr305.version>3.0.2</project.jsr305.version>
<project.guava.version>30.1-android</project.guava.version>
<project.guava.version>31.0-android</project.guava.version>
<project.xpp3.version>1.1.4c</project.xpp3.version>
<project.commons-logging.version>1.1.1</project.commons-logging.version>
<project.jdo2-api.version>2.3-eb</project.jdo2-api.version>
Expand All @@ -473,6 +483,8 @@
<project.datanucleus-rdbms.version>3.2.13</project.datanucleus-rdbms.version>
<project.datanucleus-maven-plugin.version>4.0.5</project.datanucleus-maven-plugin.version>
<project.servlet-api.version>2.5</project.servlet-api.version>
<project.auto-value-annotations.version>1.8.2</project.auto-value-annotations.version>
<project.auto-service-annotations.version>1.0</project.auto-service-annotations.version>
<deploy.autorelease>false</deploy.autorelease>
</properties>

Expand Down