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

deps: update dependency io.grpc:grpc-bom to v1.41.0 and com.google.guava:guava to v31 #244

Merged
merged 3 commits into from Oct 14, 2021

Conversation

Neenu1995
Copy link
Contributor

No description provided.

@Neenu1995 Neenu1995 requested a review from a team as a code owner October 14, 2021 13:59
@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Oct 14, 2021
@suztomo
Copy link
Member

suztomo commented Oct 14, 2021

"ci / dependencies (8) (pull_request)" failed.

****************** DEPENDENCY LIST COMPLETENESS CHECK *******************
~/work/java-common-protos/java-common-protos/grpc-google-common-protos ~/work/java-common-protos/java-common-protos
2021-10-14 14:00:13 Generating dependency list using original pom...
OpenJDK 64-Bit Server VM warning: ignoring option MaxPermSize=128m; support was removed in 8.0
2021-10-14 14:00:15 Generating dependency list using flattened pom...
OpenJDK 64-Bit Server VM warning: ignoring option MaxPermSize=128m; support was removed in 8.0
2021-10-14 14:00:20 Comparing dependency lists...
2021-10-14 14:00:20 Diff found. See below: 
2021-10-14 14:00:20 You can also check .diff.txt file located in grpc-google-common-protos.
3c3
< [INFO]    com.google.errorprone:error_prone_annotations:jar:2.9.0:compile
---
> [INFO]    com.google.errorprone:error_prone_annotations:jar:2.7.1:compile
~/work/java-common-protos/java-common-protos
~/work/java-common-protos/java-common-protos/proto-google-common-protos ~/work/java-common-protos/java-common-protos
2021-10-14 14:00:20 Generating dependency list using original pom...
OpenJDK 64-Bit Server VM warning: ignoring option MaxPermSize=128m; support was removed in 8.0
2021-10-14 14:00:22 Generating dependency list using flattened pom...
OpenJDK 64-Bit Server VM warning: ignoring option MaxPermSize=128m; support was removed in 8.0
2021-10-14 14:00:24 Comparing dependency lists...
2021-10-14 14:00:24 Success. No diff!
~/work/java-common-protos/java-common-protos
2021-10-14 14:00:24 Errors found. See log statements above.

This is the logic of the failure:

function completenessCheck() {
  # Output dep list with compile scope generated using the original pom
  # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
  # This is stripped from the output as it is not present in the flattened pom.
  # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
  msg "Generating dependency list using original pom..."
  mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt

  # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
  msg "Generating dependency list using flattened pom..."
  mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt

  # Compare two dependency lists
  msg "Comparing dependency lists..."
  diff .org-list.txt .new-list.txt >.diff.txt
  if [[ $? == 0 ]]
    then
      msg "Success. No diff!"
  else
    msg "Diff found. See below: "
    msg "You can also check .diff.txt file located in $1."
    cat .diff.txt
    return 1
  fi
}

@generated-files-bot
Copy link

Warning: This pull request is touching the following templated files:

  • .kokoro/dependencies.sh

@suztomo
Copy link
Member

suztomo commented Oct 14, 2021

The command to reproduce the error in my local environment:

suztomo@suztomo-macbookpro.roam.internal ~/java-common-protos
~/java-common-protos $ ls **/.flattened-pom.xml                                                                 git[branch:main]
grpc-google-common-protos/.flattened-pom.xml  proto-google-common-protos/.flattened-pom.xml
suztomo@suztomo-macbookpro.roam.internal ~/java-common-protos
~/java-common-protos $ cd grpc-google-common-protos                                                             git[branch:main]
suztomo@suztomo-macbookpro.roam.internal ~/java-common-protos/grpc-google-common-protos
~/java-common-protos/grpc-google-common-protos $ mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
suztomo@suztomo-macbookpro.roam.internal ~/java-common-protos/grpc-google-common-protos
~/java-common-protos/grpc-google-common-protos $ mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
suztomo@suztomo-macbookpro.roam.internal ~/java-common-protos/grpc-google-common-protos
~/java-common-protos/grpc-google-common-protos $ diff .org-list.txt .new-list.txt                  git[branch:dependency-update]
3c3
< [INFO]    com.google.errorprone:error_prone_annotations:jar:2.9.0:compile
---
> [INFO]    com.google.errorprone:error_prone_annotations:jar:2.7.1:compile

What's the difference?

~/java-common-protos/grpc-google-common-protos $ cat .org-list.txt                                 git[branch:dependency-update]
[INFO]    com.google.api.grpc:proto-google-common-protos:jar:2.5.2-SNAPSHOT:compile
[INFO]    com.google.code.findbugs:jsr305:jar:3.0.2:compile
[INFO]    com.google.errorprone:error_prone_annotations:jar:2.9.0:compile
[INFO]    com.google.guava:failureaccess:jar:1.0.1:compile
[INFO]    com.google.guava:guava:jar:31.0.1-android:compile
[INFO]    com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile
[INFO]    com.google.j2objc:j2objc-annotations:jar:1.3:compile
[INFO]    com.google.protobuf:protobuf-java:jar:3.18.1:compile
[INFO]    io.grpc:grpc-api:jar:1.41.0:compile
[INFO]    io.grpc:grpc-context:jar:1.41.0:compile
[INFO]    io.grpc:grpc-protobuf-lite:jar:1.41.0:compile
[INFO]    io.grpc:grpc-protobuf:jar:1.41.0:compile
[INFO]    io.grpc:grpc-stub:jar:1.41.0:compile
[INFO]    javax.annotation:javax.annotation-api:jar:1.3.2:compile
[INFO]    org.checkerframework:checker-compat-qual:jar:2.5.5:compile
[INFO]    org.checkerframework:checker-qual:jar:3.12.0:compile
suztomo@suztomo-macbookpro.roam.internal ~/java-common-protos/grpc-google-common-protos
~/java-common-protos/grpc-google-common-protos $ cat .new-list.txt                                 git[branch:dependency-update]
[INFO]    com.google.api.grpc:proto-google-common-protos:jar:2.5.2-SNAPSHOT:compile
[INFO]    com.google.code.findbugs:jsr305:jar:3.0.2:compile
[INFO]    com.google.errorprone:error_prone_annotations:jar:2.7.1:compile
[INFO]    com.google.guava:failureaccess:jar:1.0.1:compile
[INFO]    com.google.guava:guava:jar:31.0.1-android:compile
[INFO]    com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile
[INFO]    com.google.j2objc:j2objc-annotations:jar:1.3:compile
[INFO]    com.google.protobuf:protobuf-java:jar:3.18.1:compile
[INFO]    io.grpc:grpc-api:jar:1.41.0:compile
[INFO]    io.grpc:grpc-context:jar:1.41.0:compile
[INFO]    io.grpc:grpc-protobuf-lite:jar:1.41.0:compile
[INFO]    io.grpc:grpc-protobuf:jar:1.41.0:compile
[INFO]    io.grpc:grpc-stub:jar:1.41.0:compile
[INFO]    javax.annotation:javax.annotation-api:jar:1.3.2:compile
[INFO]    org.checkerframework:checker-compat-qual:jar:2.5.5:compile
[INFO]    org.checkerframework:checker-qual:jar:3.12.0:compile

@Neenu1995 Neenu1995 merged commit f0c638a into main Oct 14, 2021
@Neenu1995 Neenu1995 deleted the dependency-update branch October 14, 2021 14:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants