Skip to content

Update Hibernate and various other dependencies #2986

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

Open
gbrodman wants to merge 1 commit into
base: master
Choose a base branch
from
+1,691 −3,559
Open

Update Hibernate and various other dependencies #2986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions asdf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
Could not determine the dependencies of task ':core:nomulus'.
> Could not resolve all dependencies for configuration ':core:runtimeClasspath'.
> Could not resolve com.google.protobuf:protobuf-java-util:3.25.8.
Required by:
project :core > com.google.api:gax:2.67.3
project :core > com.google.cloud:google-cloud-compute:1.82.0
project :core > org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0 > com.google.cloud:google-cloud-bigquerystorage:3.15.0
project :core > org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0 > com.google.cloud:google-cloud-bigtable:2.60.0
project :core > org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0 > com.google.cloud:google-cloud-firestore:3.31.6
project :core > org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0 > com.google.cloud:google-cloud-pubsublite:1.15.9
project :core > org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0 > com.google.cloud:google-cloud-pubsub:1.140.1
project :core > org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0 > com.google.cloud:google-cloud-spanner:6.95.1
project :core > com.google.cloud:google-cloud-core:2.57.0
project :core > com.google.cloud:google-cloud-storage:2.44.1 > com.google.cloud:google-cloud-monitoring:3.65.0
project :core > com.google.cloud:google-cloud-compute:1.82.0 > com.google.api:gax-httpjson:2.69.0
> Cannot find a version of 'com.google.protobuf:protobuf-java-util' that satisfies the version constraints:
Dependency path 'nomulus:core:unspecified' --> 'com.google.api:gax:2.67.3' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.8'
Dependency path 'nomulus:core:unspecified' --> 'com.google.cloud:google-cloud-compute:1.82.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.8'
Dependency path 'nomulus:core:unspecified' --> 'com.google.cloud:google-cloud-tasks:2.51.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.5'
Dependency path 'nomulus:core:unspecified' --> 'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:4.29.4'
Dependency path 'nomulus:core:unspecified' --> 'nomulus:util:unspecified' (runtimeElements) --> 'com.google.protobuf:protobuf-java-util:{strictly [3.17.3, 4.0.0)}'
Dependency path 'nomulus:core:unspecified' --> 'org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.67.0' (runtime) --> 'com.google.cloud.bigdataoss:gcsio:2.2.26' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.3'
Dependency path 'nomulus:core:unspecified' --> 'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0' (runtime) --> 'com.google.cloud:google-cloud-bigquerystorage:3.15.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.8'
Dependency path 'nomulus:core:unspecified' --> 'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0' (runtime) --> 'com.google.cloud:google-cloud-bigtable:2.60.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.8'
Dependency path 'nomulus:core:unspecified' --> 'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0' (runtime) --> 'com.google.cloud:google-cloud-firestore:3.31.6' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.8'
Dependency path 'nomulus:core:unspecified' --> 'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0' (runtime) --> 'com.google.cloud:google-cloud-pubsublite:1.15.9' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.8'
Dependency path 'nomulus:core:unspecified' --> 'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0' (runtime) --> 'com.google.cloud:google-cloud-pubsub:1.140.1' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.8'
Dependency path 'nomulus:core:unspecified' --> 'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0' (runtime) --> 'com.google.cloud:google-cloud-spanner:6.95.1' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.8'
Dependency path 'nomulus:core:unspecified' --> 'com.google.cloud:google-cloud-core:2.57.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.8'
Dependency path 'nomulus:core:unspecified' --> 'com.google.cloud:google-cloud-storage:2.44.1' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.5'
Dependency path 'nomulus:core:unspecified' --> 'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0' (runtime) --> 'com.google.cloud:google-cloud-bigtable:2.60.0' (runtime) --> 'com.google.cloud:google-cloud-monitoring:3.65.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.8'
Dependency path 'nomulus:core:unspecified' --> 'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.67.0' (runtime) --> 'com.google.cloud:google-cloud-firestore:3.31.6' (runtime) --> 'com.google.cloud.opentelemetry:exporter-metrics:0.33.0' (runtimeElements) --> 'com.google.cloud:libraries-bom:26.48.0' (platform-runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.5'
Dependency path 'nomulus:core:unspecified' --> 'com.google.cloud:google-cloud-tasks:2.51.0' (runtime) --> 'io.grpc:grpc-grpclb:1.71.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.5'
Dependency path 'nomulus:core:unspecified' --> 'com.google.cloud:google-cloud-tasks:2.51.0' (runtime) --> 'io.grpc:grpc-xds:1.71.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.5'
Dependency path 'nomulus:core:unspecified' --> 'com.google.cloud:google-cloud-tasks:2.51.0' (runtime) --> 'io.grpc:grpc-services:1.71.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.5'
Dependency path 'nomulus:core:unspecified' --> 'com.google.cloud:google-cloud-compute:1.82.0' (runtime) --> 'com.google.api:gax-httpjson:2.69.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.8'
Dependency path 'nomulus:core:unspecified' --> 'com.google.cloud:google-cloud-secretmanager:2.51.0' (runtime) --> 'com.google.protobuf:protobuf-java-util:3.25.5'

17 changes: 9 additions & 8 deletions common/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
com.github.ben-manes.caffeine:caffeine:3.2.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
com.github.ben-manes.caffeine:caffeine:3.2.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
com.google.auto.value:auto-value-annotations:1.11.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
Expand All @@ -12,7 +12,7 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationP
com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,testing,testingAnnotationProcessor,testingCompileClasspath
com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
com.google.errorprone:error_prone_annotations:2.40.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
com.google.errorprone:error_prone_annotations:2.43.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
com.google.errorprone:error_prone_annotations:2.7.1=checkstyle
com.google.errorprone:error_prone_check_api:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
com.google.errorprone:error_prone_core:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
Expand All @@ -24,13 +24,13 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,deploy_jar,runtimeClasspat
com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
com.google.guava:guava:31.0.1-jre=checkstyle
com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
com.google.guava:guava:33.2.1-android=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
com.google.guava:guava:33.4.3-android=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
com.google.j2objc:j2objc-annotations:1.3=checkstyle
com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath,testingCompileClasspath
com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
com.google.truth:truth:1.4.4=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
com.google.truth:truth:1.4.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
com.puppycrawl.tools:checkstyle:9.3=checkstyle
commons-beanutils:commons-beanutils:1.9.4=checkstyle
commons-collections:commons-collections:3.2.2=checkstyle
Expand All @@ -40,14 +40,14 @@ io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,te
io.github.java-diff-utils:java-diff-utils:4.16=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
joda-time:joda-time:2.14.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
joda-time:joda-time:2.14.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
net.sf.saxon:Saxon-HE:10.6=checkstyle
org.antlr:antlr4-runtime:4.9.3=checkstyle
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
org.checkerframework:checker-qual:3.12.0=checkstyle
org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
org.checkerframework:checker-qual:3.42.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
org.checkerframework:checker-qual:3.43.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
org.jacoco:org.jacoco.agent:0.8.12=jacocoAgent,jacocoAnt
org.jacoco:org.jacoco.ant:0.8.12=jacocoAnt
Expand All @@ -64,7 +64,8 @@ org.junit:junit-bom:5.13.4=testCompileClasspath,testRuntimeClasspath
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
org.ow2.asm:asm-commons:9.7=jacocoAnt
org.ow2.asm:asm-tree:9.7=jacocoAnt
org.ow2.asm:asm:9.7=compileClasspath,deploy_jar,jacocoAnt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
org.ow2.asm:asm:9.7=jacocoAnt
org.ow2.asm:asm:9.8=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
org.reflections:reflections:0.10.2=checkstyle
empty=testingCompile,testingRuntime,testingRuntimeClasspath
5 changes: 5 additions & 0 deletions config/dependency-license/allowed_licenses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,11 @@
"moduleLicense": null,
"moduleName": "com.fasterxml.jackson:jackson-bom"
},
{
// "Apache License, Version 2.0".
"moduleLicense": null,
"moduleName": "tools.jackson:jackson-bom"
},
{
// "Apache License, Version 2.0".
"moduleLicense": null,
Expand Down
9 changes: 8 additions & 1 deletion config/presubmits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,14 @@ def fails(self, file):
{"/node_modules/"},
):
"Do not use javax.inject.* Use jakarta.inject.* instead.",
PresubmitCheck(
r".*import jakarta.persistence.(Pre|Post)(Persist|Load|Remove|Update);",
"java",
{"EntityCallbacksListener.java"},
):
"Hibernate lifecycle events aren't called for embedded entities, so it's "
"usually best to avoid them. Instead, use the annotations defined in "
"EntityCallbacksListener.java"
}

# Note that this regex only works for one kind of Flyway file. If we want to
Expand Down Expand Up @@ -274,7 +282,6 @@ def get_files():


if __name__ == "__main__":
print('python version is %s' % sys.version)
failed = False
for file in get_files():
error_messages = []
Expand Down
Loading
Loading