diff --git a/common/gradle.lockfile b/common/gradle.lockfile index 4f05608bf..59eba3c88 100644 --- a/common/gradle.lockfile +++ b/common/gradle.lockfile @@ -24,7 +24,7 @@ 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.0-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath +com.google.guava:guava:33.2.1-jre=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 diff --git a/core/build.gradle b/core/build.gradle index c29a9232e..e22f22525 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -135,14 +135,12 @@ dependencies { implementation deps['com.google.api.grpc:proto-google-common-protos'] implementation deps['com.google.api.grpc:proto-google-cloud-secretmanager-v1'] implementation deps['com.google.api-client:google-api-client'] - implementation deps['com.google.api-client:google-api-client-appengine'] implementation deps['com.google.api-client:google-api-client-servlet'] implementation deps['com.google.monitoring-client:metrics'] implementation deps['com.google.monitoring-client:stackdriver'] implementation deps['com.google.api-client:google-api-client-java6'] implementation deps['com.google.api.grpc:proto-google-cloud-tasks-v2'] implementation deps['com.google.apis:google-api-services-admin-directory'] - implementation deps['com.google.apis:google-api-services-appengine'] implementation deps['com.google.apis:google-api-services-bigquery'] implementation deps['com.google.apis:google-api-services-dataflow'] implementation deps['com.google.apis:google-api-services-dns'] @@ -176,12 +174,10 @@ dependencies { implementation deps['com.google.cloud:google-cloud-storage'] implementation deps['com.google.cloud:google-cloud-tasks'] implementation deps['com.google.http-client:google-http-client'] - implementation deps['com.google.http-client:google-http-client-appengine'] implementation deps['com.google.http-client:google-http-client-jackson2'] implementation deps['com.google.oauth-client:google-oauth-client'] implementation deps['com.google.oauth-client:google-oauth-client-java6'] implementation deps['com.google.oauth-client:google-oauth-client-jetty'] - implementation deps['com.google.oauth-client:google-oauth-client-appengine'] implementation deps['com.google.oauth-client:google-oauth-client-servlet'] implementation deps['com.google.protobuf:protobuf-java'] implementation deps['com.google.re2j:re2j'] diff --git a/core/gradle.lockfile b/core/gradle.lockfile index e2ef81a1c..a0dce12a8 100644 --- a/core/gradle.lockfile +++ b/core/gradle.lockfile @@ -40,11 +40,10 @@ com.github.jnr:jnr-unixsocket:0.38.22=compileClasspath,deploy_jar,nonprodCompile com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor com.google.android:annotations:4.1.1.4=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client-appengine:2.6.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.6.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api-client:google-api-client:1.35.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.6.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:gapic-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.api.grpc:gapic-google-cloud-storage-v2:2.39.0-alpha=testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,12 +87,11 @@ com.google.api:gax-grpc:2.48.1=compileClasspath,deploy_jar,nonprodCompileClasspa com.google.api:gax-httpjson:2.48.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api:gax:2.48.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev20240509-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20240415-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240229-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240423-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240218-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v2-rev393-1.25.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240430-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240419-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240521-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20210624-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -112,7 +110,8 @@ com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compi com.google.auto.service:auto-service:1.1.1=annotationProcessor com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor -com.google.auto.value:auto-value:1.10.4=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.auto.value:auto-value:1.10.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.value:auto-value:1.11.0=annotationProcessor,testAnnotationProcessor com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor com.google.closure-stylesheets:closure-stylesheets:1.5.0=css com.google.cloud.bigdataoss:gcsio:2.2.16=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -170,19 +169,19 @@ com.google.googlejavaformat:google-java-format:1.5=annotationProcessor,testAnnot com.google.guava:failureaccess:1.0.1=checkstyle,errorprone,nonprodAnnotationProcessor,soy com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.guava:guava-parent:32.1.1-jre=errorprone,nonprodAnnotationProcessor -com.google.guava:guava-testlib:33.2.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava-testlib:33.2.1-jre=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:20.0=css com.google.guava:guava:31.0.1-jre=checkstyle,soy com.google.guava:guava:32.1.1-jre=errorprone,nonprodAnnotationProcessor com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor com.google.guava:guava:33.2.0-android=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath -com.google.guava:guava:33.2.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-apache-v2:1.43.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath -com.google.http-client:google-http-client-apache-v2:1.44.1=testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-appengine:1.44.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-gson:1.44.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-appengine:1.43.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath +com.google.http-client:google-http-client-appengine:1.44.1=testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-gson:1.44.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-jackson2:1.44.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-protobuf:1.44.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.44.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -200,7 +199,6 @@ com.google.jsinterop:jsinterop-annotations:2.0.0=compileClasspath,deploy_jar,non com.google.monitoring-client:contrib:1.0.7=testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:metrics:1.0.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:stackdriver:1.0.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.oauth-client:google-oauth-client-appengine:1.36.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-java6:1.36.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-jetty:1.36.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.36.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -400,18 +398,18 @@ org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,deploy_jar,nonprodCo org.easymock:easymock:3.0=css org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.9=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.9=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-ee:12.0.9=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.9=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.9=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.9=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.9=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.9=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.9=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-xml:12.0.9=testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.13.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.13.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.10=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.10=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-ee:12.0.10=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.0.10=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.0.10=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.0.10=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.0.10=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.0.10=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.0.10=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-xml:12.0.10=testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.14.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.14.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java b/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java index 6baef1d9a..cca04250a 100644 --- a/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java +++ b/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java @@ -401,7 +401,7 @@ public class CloudDnsWriter extends BaseDnsWriter { if (err == null || err.getErrors().size() > 1) { throw e; } - String errorReason = err.getErrors().get(0).getReason(); + String errorReason = err.getErrors().getFirst().getReason(); if (RETRYABLE_EXCEPTION_REASONS.contains(errorReason)) { throw new ZoneStateException(errorReason); diff --git a/core/src/main/java/google/registry/storage/drive/DriveConnection.java b/core/src/main/java/google/registry/storage/drive/DriveConnection.java index b10864ddc..e4fbc7c86 100644 --- a/core/src/main/java/google/registry/storage/drive/DriveConnection.java +++ b/core/src/main/java/google/registry/storage/drive/DriveConnection.java @@ -16,11 +16,9 @@ package google.registry.storage.drive; import com.google.api.client.http.ByteArrayContent; import com.google.api.services.drive.Drive; -import com.google.api.services.drive.Drive.Children; -import com.google.api.services.drive.model.ChildList; -import com.google.api.services.drive.model.ChildReference; +import com.google.api.services.drive.Drive.Files; import com.google.api.services.drive.model.File; -import com.google.api.services.drive.model.ParentReference; +import com.google.api.services.drive.model.FileList; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.net.MediaType; @@ -37,16 +35,19 @@ public class DriveConnection { /** Drive client instance wrapped by this class. */ @Inject Drive drive; - @Inject public DriveConnection() {} + + @Inject + public DriveConnection() {} /** * Creates a folder with the given parent. * * @return the folder id. */ - public String createFolder(String title, String parentFolderId) throws IOException { - return drive.files() - .insert(createFileReference(title, GOOGLE_FOLDER, parentFolderId)) + public String createFolder(String name, @Nullable String parentFolderId) throws IOException { + return drive + .files() + .create(createFileReference(name, GOOGLE_FOLDER, parentFolderId)) .execute() .getId(); } @@ -60,11 +61,12 @@ public class DriveConnection { * * @return the file id. */ - public String createFile(String title, MediaType mimeType, String parentFolderId, byte[] bytes) + public String createFile(String name, MediaType mimeType, String parentFolderId, byte[] bytes) throws IOException { - return drive.files() - .insert( - createFileReference(title, mimeType, parentFolderId), + return drive + .files() + .create( + createFileReference(name, mimeType, parentFolderId), new ByteArrayContent(mimeType.toString(), bytes)) .execute() .getId(); @@ -72,79 +74,79 @@ public class DriveConnection { /** * Creates a file with the given parent or updates the existing one if a file already exists with - * that same title and parent. + * that same name and parent. * * @throws IllegalStateException if multiple files with that name exist in the given folder. * @throws IOException if communication with Google Drive fails for any reason. * @return the file id. */ public String createOrUpdateFile( - String title, MediaType mimeType, String parentFolderId, byte[] bytes) throws IOException { - List existingFiles = listFiles(parentFolderId, String.format("title = '%s'", title)); + String name, MediaType mimeType, String parentFolderId, byte[] bytes) throws IOException { + List existingFiles = listFiles(parentFolderId, String.format("name = '%s'", name)); if (existingFiles.size() > 1) { - throw new IllegalStateException(String.format( - "Could not update file '%s' in Drive folder id '%s' because multiple files with that " - + "name already exist.", - title, - parentFolderId)); + throw new IllegalStateException( + String.format( + "Could not update file '%s' in Drive folder id '%s' because multiple files with that " + + "name already exist.", + name, parentFolderId)); } return existingFiles.isEmpty() - ? createFile(title, mimeType, parentFolderId, bytes) - : updateFile(existingFiles.get(0), title, mimeType, bytes); + ? createFile(name, mimeType, parentFolderId, bytes) + : updateFile(existingFiles.getFirst(), name, mimeType, bytes); } /** - * Updates the file with the given id in place, setting the title, content, and mime type to the + * Updates the file with the given id in place, setting the name, content, and mime type to the * newly specified values. * * @return the file id. */ - public String updateFile(String fileId, String title, MediaType mimeType, byte[] bytes) + public String updateFile(String fileId, String name, MediaType mimeType, byte[] bytes) throws IOException { - File file = new File().setTitle(title); - return drive.files() + File file = new File().setName(name); + return drive + .files() .update(fileId, file, new ByteArrayContent(mimeType.toString(), bytes)) .execute() .getId(); } + /** - * Returns a list of Drive file ids for all files in Google Drive in the folder with the - * specified id. + * Returns a list of Drive file ids for all files in Google Drive in the folder with the specified + * id. */ public List listFiles(String parentFolderId) throws IOException { return listFiles(parentFolderId, null); } /** - * Returns a list of Drive file ids for all files in Google Drive in the folder with the - * specified id and matching the given Drive query. + * Returns a list of Drive file ids for all files in Google Drive in the folder with the specified + * id and matching the given Drive query. * * @see The query format */ public List listFiles(String parentFolderId, String query) throws IOException { ImmutableList.Builder result = new ImmutableList.Builder<>(); - Children.List req = drive.children().list(parentFolderId); + Files.List req = drive.files().list(); + StringBuilder q = new StringBuilder(String.format("'%s' in parents", parentFolderId)); if (!Strings.isNullOrEmpty(query)) { - req.setQ(query); + q.append(String.format(" and %s", query)); } + req.setQ(q.toString()); do { - ChildList files = req.execute(); - for (ChildReference child : files.getItems()) { - result.add(child.getId()); - } + FileList files = req.execute(); + files.getFiles().forEach(file -> result.add(file.getId())); req.setPageToken(files.getNextPageToken()); } while (!Strings.isNullOrEmpty(req.getPageToken())); return result.build(); } - /** Constructs an object representing a file (or folder) with a given title and parent. */ + /** Constructs an object representing a file (or folder) with a given name and parent. */ private File createFileReference( - String title, MediaType mimeType, @Nullable String parentFolderId) { + String name, MediaType mimeType, @Nullable String parentFolderId) { return new File() - .setTitle(title) + .setName(name) .setMimeType(mimeType.toString()) - .setParents(parentFolderId == null - ? null - : ImmutableList.of(new ParentReference().setId(parentFolderId))); + .setParents(parentFolderId == null ? null : ImmutableList.of(parentFolderId)); } } diff --git a/core/src/test/java/google/registry/storage/drive/DriveConnectionTest.java b/core/src/test/java/google/registry/storage/drive/DriveConnectionTest.java index 64c164691..a5003cb27 100644 --- a/core/src/test/java/google/registry/storage/drive/DriveConnectionTest.java +++ b/core/src/test/java/google/registry/storage/drive/DriveConnectionTest.java @@ -18,7 +18,6 @@ import static com.google.common.io.ByteStreams.toByteArray; import static com.google.common.truth.Truth.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -28,12 +27,9 @@ import static org.mockito.Mockito.when; import com.google.api.client.http.ByteArrayContent; import com.google.api.services.drive.Drive; -import com.google.api.services.drive.Drive.Children; import com.google.api.services.drive.Drive.Files; -import com.google.api.services.drive.model.ChildList; -import com.google.api.services.drive.model.ChildReference; import com.google.api.services.drive.model.File; -import com.google.api.services.drive.model.ParentReference; +import com.google.api.services.drive.model.FileList; import com.google.common.collect.ImmutableList; import com.google.common.net.MediaType; import java.util.Arrays; @@ -47,15 +43,13 @@ class DriveConnectionTest { private final Drive drive = mock(Drive.class); private final Files files = mock(Files.class); - private final Children children = mock(Children.class); - private final Files.Insert insert = mock(Files.Insert.class); + private final Files.Create create = mock(Files.Create.class); private final Files.Update update = mock(Files.Update.class); - private final Children.List childrenList = mock(Children.List.class); + private final Files.List filesList = mock(Files.List.class); private static final byte[] DATA = {1, 2, 3}; - ChildList childList; private DriveConnection driveConnection; - private List allChildren; + private List allFiles; private ArgumentMatcher hasByteArrayContent(final byte[] data) { return arg -> { @@ -72,154 +66,143 @@ class DriveConnectionTest { driveConnection = new DriveConnection(); driveConnection.drive = drive; when(drive.files()).thenReturn(files); - when(drive.children()).thenReturn(children); - when(insert.execute()).thenReturn(new File().setId("id")); + when(create.execute()).thenReturn(new File().setId("id")); when(update.execute()).thenReturn(new File().setId("id")); // Mocking required for listFiles. - ChildReference child1 = new ChildReference().setId("child1"); - ChildReference child2 = new ChildReference().setId("child2"); - ChildReference child3 = new ChildReference().setId("child3"); - ChildReference child4 = new ChildReference().setId("child4"); - List children1 = ImmutableList.of(child1, child2); - List children2 = ImmutableList.of(child3, child4); - allChildren = ImmutableList.of(child1.getId(), child2.getId(), child3.getId(), child4.getId()); - ChildList childList1 = new ChildList(); - childList1.setItems(children1); - childList1.setNextPageToken("page2"); - ChildList childList2 = new ChildList(); - childList2.setItems(children2); - childList2.setNextPageToken(null); - when(childrenList.execute()).thenReturn(childList1, childList2); - when(childrenList.setQ(anyString())).thenReturn(childrenList); - when(childrenList.getPageToken()).thenCallRealMethod(); - when(childrenList.setPageToken(any())).thenCallRealMethod(); - when(children.list("driveFolderId")).thenReturn(childrenList); + File file1 = new File().setId("file1"); + File file2 = new File().setId("file2"); + File file3 = new File().setId("file2"); + File file4 = new File().setId("file4"); + List files1 = ImmutableList.of(file1, file2); + List files2 = ImmutableList.of(file3, file4); + allFiles = ImmutableList.of(file1.getId(), file2.getId(), file3.getId(), file4.getId()); + FileList fileList1 = new FileList(); + fileList1.setFiles(files1); + fileList1.setNextPageToken("page2"); + FileList fileList2 = new FileList(); + fileList2.setFiles(files2); + fileList2.setNextPageToken(null); + when(filesList.execute()).thenReturn(fileList1, fileList2); + when(filesList.getPageToken()).thenCallRealMethod(); + when(filesList.setPageToken(any())).thenCallRealMethod(); + when(files.list()).thenReturn(filesList); } @Test void testCreateFileAtRoot() throws Exception { - when(files.insert( - eq(new File().setTitle("title").setMimeType("image/gif")), + when(files.create( + eq(new File().setName("name").setMimeType("image/gif")), argThat(hasByteArrayContent(DATA)))) - .thenReturn(insert); - assertThat(driveConnection.createFile("title", MediaType.GIF, null, DATA)).isEqualTo("id"); + .thenReturn(create); + assertThat(driveConnection.createFile("name", MediaType.GIF, null, DATA)).isEqualTo("id"); } @Test void testCreateFileInFolder() throws Exception { - when(files.insert( + when(files.create( eq( new File() - .setTitle("title") + .setName("name") .setMimeType("image/gif") - .setParents(ImmutableList.of(new ParentReference().setId("parent")))), + .setParents(ImmutableList.of("parent"))), argThat(hasByteArrayContent(DATA)))) - .thenReturn(insert); - assertThat(driveConnection.createFile("title", MediaType.GIF, "parent", DATA)).isEqualTo("id"); + .thenReturn(create); + assertThat(driveConnection.createFile("name", MediaType.GIF, "parent", DATA)).isEqualTo("id"); } @Test void testCreateFolderAtRoot() throws Exception { - when(files.insert( - new File().setTitle("title").setMimeType("application/vnd.google-apps.folder"))) - .thenReturn(insert); - assertThat(driveConnection.createFolder("title", null)).isEqualTo("id"); + when(files.create(new File().setName("name").setMimeType("application/vnd.google-apps.folder"))) + .thenReturn(create); + assertThat(driveConnection.createFolder("name", null)).isEqualTo("id"); } @Test void testCreateFolderInFolder() throws Exception { - when(files.insert( + when(files.create( new File() - .setTitle("title") + .setName("name") .setMimeType("application/vnd.google-apps.folder") - .setParents(ImmutableList.of(new ParentReference().setId("parent"))))) - .thenReturn(insert); - assertThat(driveConnection.createFolder("title", "parent")).isEqualTo("id"); + .setParents(ImmutableList.of("parent")))) + .thenReturn(create); + assertThat(driveConnection.createFolder("name", "parent")).isEqualTo("id"); } @Test void testListFiles_noQueryWithPagination() throws Exception { - assertThat(driveConnection.listFiles("driveFolderId")).containsExactlyElementsIn(allChildren); - verify(childrenList).setPageToken("page2"); - verify(childrenList).setPageToken(null); - verify(childrenList, times(0)).setQ(anyString()); - verify(childrenList, times(2)).getPageToken(); + assertThat(driveConnection.listFiles("driveFolderId")).containsExactlyElementsIn(allFiles); + verify(filesList).setPageToken("page2"); + verify(filesList).setPageToken(null); + verify(filesList, times(1)).setQ("'driveFolderId' in parents"); + verify(filesList, times(2)).getPageToken(); } @Test void testListFiles_withQueryAndPagination() throws Exception { assertThat(driveConnection.listFiles("driveFolderId", "sampleQuery")) - .containsExactlyElementsIn(allChildren); - verify(childrenList).setPageToken("page2"); - verify(childrenList).setPageToken(null); - verify(childrenList, times(1)).setQ("sampleQuery"); - verify(childrenList, times(2)).getPageToken(); + .containsExactlyElementsIn(allFiles); + verify(filesList).setPageToken("page2"); + verify(filesList).setPageToken(null); + verify(filesList, times(1)).setQ("'driveFolderId' in parents and sampleQuery"); + verify(filesList, times(2)).getPageToken(); } @Test void testCreateOrUpdateFile_succeedsForNewFile() throws Exception { - when(files.insert( + when(files.create( eq( new File() - .setTitle("title") + .setName("name") .setMimeType("video/webm") - .setParents(ImmutableList.of(new ParentReference().setId("driveFolderId")))), + .setParents(ImmutableList.of("driveFolderId"))), argThat(hasByteArrayContent(DATA)))) - .thenReturn(insert); - ChildList emptyChildList = new ChildList().setItems(ImmutableList.of()).setNextPageToken(null); - when(childrenList.execute()).thenReturn(emptyChildList); + .thenReturn(create); + FileList emptyFileList = new FileList().setFiles(ImmutableList.of()).setNextPageToken(null); + when(filesList.execute()).thenReturn(emptyFileList); assertThat( - driveConnection.createOrUpdateFile( - "title", MediaType.WEBM_VIDEO, "driveFolderId", DATA)) + driveConnection.createOrUpdateFile("name", MediaType.WEBM_VIDEO, "driveFolderId", DATA)) .isEqualTo("id"); } @Test void testCreateOrUpdateFile_succeedsForUpdatingFile() throws Exception { - when(files.update( - eq("id"), eq(new File().setTitle("title")), argThat(hasByteArrayContent(DATA)))) + when(files.update(eq("id"), eq(new File().setName("name")), argThat(hasByteArrayContent(DATA)))) .thenReturn(update); - ChildList childList = - new ChildList() - .setItems(ImmutableList.of(new ChildReference().setId("id"))) - .setNextPageToken(null); - when(childrenList.execute()).thenReturn(childList); + FileList fileList = + new FileList().setFiles(ImmutableList.of(new File().setId("id"))).setNextPageToken(null); + when(filesList.execute()).thenReturn(fileList); assertThat( - driveConnection.createOrUpdateFile( - "title", MediaType.WEBM_VIDEO, "driveFolderId", DATA)) + driveConnection.createOrUpdateFile("name", MediaType.WEBM_VIDEO, "driveFolderId", DATA)) .isEqualTo("id"); } @Test void testCreateOrUpdateFile_throwsExceptionWhenMultipleFilesWithNameAlreadyExist() throws Exception { - ChildList childList = - new ChildList() - .setItems( - ImmutableList.of( - new ChildReference().setId("id1"), new ChildReference().setId("id2"))) + FileList fileList = + new FileList() + .setFiles(ImmutableList.of(new File().setId("id1"), new File().setId("id2"))) .setNextPageToken(null); - when(childrenList.execute()).thenReturn(childList); + when(filesList.execute()).thenReturn(fileList); IllegalStateException thrown = assertThrows( IllegalStateException.class, () -> driveConnection.createOrUpdateFile( - "title", MediaType.WEBM_VIDEO, "driveFolderId", DATA)); + "name", MediaType.WEBM_VIDEO, "driveFolderId", DATA)); assertThat(thrown) .hasMessageThat() .contains( - "Could not update file 'title' in Drive folder id 'driveFolderId' " + "Could not update file 'name' in Drive folder id 'driveFolderId' " + "because multiple files with that name already exist."); } @Test void testUpdateFile_succeeds() throws Exception { - when(files.update( - eq("id"), eq(new File().setTitle("title")), argThat(hasByteArrayContent(DATA)))) + when(files.update(eq("id"), eq(new File().setName("name")), argThat(hasByteArrayContent(DATA)))) .thenReturn(update); - assertThat(driveConnection.updateFile("id", "title", MediaType.WEBM_VIDEO, DATA)) + assertThat(driveConnection.updateFile("id", "name", MediaType.WEBM_VIDEO, DATA)) .isEqualTo("id"); } } diff --git a/core/src/test/java/google/registry/ui/server/console/ConsoleUpdateRegistrarActionTest.java b/core/src/test/java/google/registry/ui/server/console/ConsoleUpdateRegistrarActionTest.java index 46cbb5fc8..e04685cf0 100644 --- a/core/src/test/java/google/registry/ui/server/console/ConsoleUpdateRegistrarActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/ConsoleUpdateRegistrarActionTest.java @@ -99,7 +99,7 @@ class ConsoleUpdateRegistrarActionTest { new JpaTestExtensions.Builder().buildIntegrationTestExtension(); @Test - void testSuccess__updatesRegistrar() throws IOException { + void testSuccess_updatesRegistrar() throws IOException { var action = createAction(String.format(registrarPostData, "TheRegistrar", "app, dev", false)); action.run(); Registrar newRegistrar = Registrar.loadByRegistrarId("TheRegistrar").get(); @@ -109,7 +109,7 @@ class ConsoleUpdateRegistrarActionTest { } @Test - void testFails__missingWhoisContact() throws IOException { + void testFails_missingWhoisContact() throws IOException { RegistryEnvironment.PRODUCTION.setup(systemPropertyExtension); var action = createAction(String.format(registrarPostData, "TheRegistrar", "app, dev", false)); action.run(); @@ -119,7 +119,7 @@ class ConsoleUpdateRegistrarActionTest { } @Test - void testSuccess__presentWhoisContact() throws IOException { + void testSuccess_presentWhoisContact() throws IOException { RegistryEnvironment.PRODUCTION.setup(systemPropertyExtension); RegistrarPoc contact = new RegistrarPoc.Builder() @@ -143,7 +143,7 @@ class ConsoleUpdateRegistrarActionTest { } @Test - void testSuccess__sendsEmail() throws AddressException, IOException { + void testSuccess_sendsEmail() throws AddressException, IOException { var action = createAction(String.format(registrarPostData, "TheRegistrar", "app, dev", false)); action.run(); verify(consoleApiParams.sendEmailUtils().gmailClient, times(1)) diff --git a/db/buildscript-gradle.lockfile b/db/buildscript-gradle.lockfile index 557a44aaa..f358beb64 100644 --- a/db/buildscript-gradle.lockfile +++ b/db/buildscript-gradle.lockfile @@ -9,6 +9,6 @@ com.fasterxml.jackson:jackson-bom:2.15.2=classpath com.google.code.gson:gson:2.10.1=classpath gradle.plugin.org.flywaydb:gradle-plugin-publishing:10.13.0=classpath org.flywaydb.flyway:org.flywaydb.flyway.gradle.plugin:10.13.0=classpath -org.flywaydb:flyway-core:10.13.0=classpath -org.flywaydb:flyway-database-postgresql:10.13.0=classpath +org.flywaydb:flyway-core:10.14.0=classpath +org.flywaydb:flyway-database-postgresql:10.14.0=classpath empty= diff --git a/db/gradle.lockfile b/db/gradle.lockfile index 29fbddfbb..32b0e4989 100644 --- a/db/gradle.lockfile +++ b/db/gradle.lockfile @@ -51,7 +51,7 @@ com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,testAnno com.google.guava:guava:31.0.1-jre=checkstyle com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor com.google.guava:guava:33.2.0-android=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.guava:guava:33.2.0-jre=testCompileClasspath +com.google.guava:guava:33.2.1-jre=testCompileClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -90,8 +90,8 @@ org.checkerframework:checker-compat-qual:2.5.3=testCompileClasspath,testRuntimeC org.checkerframework:checker-qual:3.12.0=checkstyle org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor org.checkerframework:checker-qual:3.42.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.13.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.13.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.14.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.14.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.11=jacocoAnt diff --git a/dependencies.gradle b/dependencies.gradle index f5fa95d4f..499ea1f7c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -38,14 +38,6 @@ ext { // PINNED VERSIONS START HERE. - // Breaking changes causing compilation error. - // TODO: Migrate to com.google.cloud:google-cloud-dns if - // https://github.com/googleapis/google-cloud-java/issues/8929 is fixed. - // At least migrate to v2. - 'com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0', - // TODO: Migrate to v3 - 'com.google.apis:google-api-services-drive:v2-rev393-1.25.0', - // TODO: Remove after the legacy console is deleted. 'com.google.closure-stylesheets:closure-stylesheets:1.5.0', 'com.google.javascript:closure-compiler:v20210505', @@ -89,25 +81,27 @@ ext { // (I think). 'com.sun.xml.bind:jaxb-xjc:[2.3.3, 2.4)!!', - // Excluding versions 2.0+ because it is runtime incompatible with the - // pinned google-api-services-(dns|drive) libraries. They have a - // hardcoded dependency on major version version 1. - // TODO: Remove the cap after the pins are removed. - 'com.google.api-client:google-api-client:[1.31.3,2)!!', - // Dagger doesn't support the Jakarta namespace yet. Pre-2.0 Jakarta // Inject still use the old javax namespace. // TODO: Remove the cap when https://github.com/google/dagger/issues/2058 // is released. 'jakarta.inject:jakarta.inject-api:[1,2.0.0)!!', + // This packages has a broken versioning scheme. There are v1beta3-* and + // v1b4-* packages that are way older than v1b3-rev2024MMDD-* that need to + // be excluded. + 'com.google.apis:google-api-services-dataflow:[v1b3-rev20240430-2.0.0, v1b4)!!', + + // v2 has not been updated since 2022, seems abandoned. It also requires + // google-api-client major version 1. + 'com.google.apis:google-api-services-dns:[v1-rev20240419-2.0.0, v2beta)', // DYNAMIC VERSIONS START HERE. 'args4j:args4j:[2.0.26,)', 'com.fasterxml.jackson.core:jackson-databind:[2.11.2,)', 'com.github.ben-manes.caffeine:caffeine:[3.0.0,)', - 'com.google.api-client:google-api-client-appengine:[1.31.3,)', + 'com.google.api-client:google-api-client:[1.31.3,)', 'com.google.api-client:google-api-client-java6:[1.31.3,)', 'com.google.api-client:google-api-client-servlet:[1.31.3,)', 'com.google.api.grpc:proto-google-cloud-secretmanager-v1:[1.4.0,)', @@ -115,15 +109,14 @@ ext { 'com.google.api.grpc:proto-google-common-protos:[2.1.0,)', 'com.google.api:gax:[1.66.0,)', 'com.google.apis:google-api-services-admin-directory:[directory_v1-rev20240102-2.0.0,)', - 'com.google.apis:google-api-services-appengine:[v1-rev130-1.25.0,)', - 'com.google.apis:google-api-services-bigquery:[v2-rev459-1.25.0,)', - 'com.google.apis:google-api-services-cloudkms:[v1-rev108-1.25.0,)', - 'com.google.apis:google-api-services-dataflow:[v1b3-rev302-1.25.0,)', + 'com.google.apis:google-api-services-bigquery:[v2-rev20240423-2.0.0,)', + 'com.google.apis:google-api-services-cloudkms:[v1-rev20240513-2.0.0,)', + 'com.google.apis:google-api-services-drive:[v3-rev20240521-2.0.0,)', 'com.google.apis:google-api-services-gmail:[v1-rev20220404-2.0.0,)', 'com.google.apis:google-api-services-groupssettings:[v1-rev82-1.25.0,)', 'com.google.apis:google-api-services-iam:[v1-rev20240118-2.0.0,0)', - 'com.google.apis:google-api-services-monitoring:[v3-rev540-1.25.0,)', - 'com.google.apis:google-api-services-sheets:[v4-rev612-1.25.0,)', + 'com.google.apis:google-api-services-monitoring:[v3-rev20240519-2.0.0,)', + 'com.google.apis:google-api-services-sheets:[v4-rev20240514-2.0.0,)', 'com.google.apis:google-api-services-storage:[v1-rev20210127-1.31.0,)', 'com.google.auth:google-auth-library-credentials:[0.24.1,)', 'com.google.auth:google-auth-library-oauth2-http:[0.24.1,)', @@ -150,7 +143,6 @@ ext { 'com.google.guava:guava-testlib:[33.0.0-jre,)', 'com.google.guava:guava:[33.0.0-jre,)', 'com.google.gwt:gwt-user:[2.9.0,)', - 'com.google.http-client:google-http-client-appengine:[1.39.0,)', 'com.google.http-client:google-http-client-jackson2:[1.39.0,)', 'com.google.http-client:google-http-client:[1.39.0,)', // TODO: Remove after the old console is removed (dependency of soy). @@ -158,7 +150,6 @@ ext { 'com.google.monitoring-client:contrib:[1.0.7,)', 'com.google.monitoring-client:metrics:[1.0.7,)', 'com.google.monitoring-client:stackdriver:[1.0.7,)', - 'com.google.oauth-client:google-oauth-client-appengine:[1.31.4,)', 'com.google.oauth-client:google-oauth-client-java6:[1.31.4,)', 'com.google.oauth-client:google-oauth-client-jetty:[1.31.4,)', 'com.google.oauth-client:google-oauth-client-servlet:[1.31.4,)', diff --git a/jetty/gradle.lockfile b/jetty/gradle.lockfile index ef7df2ff4..857c7f991 100644 --- a/jetty/gradle.lockfile +++ b/jetty/gradle.lockfile @@ -29,11 +29,10 @@ com.github.jnr:jnr-unixsocket:0.38.22=deploy_jar,runtimeClasspath,testRuntimeCla com.github.jnr:jnr-x86asm:1.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.android:annotations:4.1.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client-appengine:2.6.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client-jackson2:2.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client-java6:2.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.6.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client:1.35.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.6.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:gapic-google-cloud-storage-v2:2.32.1-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.176.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -73,12 +72,11 @@ com.google.api:gax-grpc:2.48.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api:gax-httpjson:2.48.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api:gax:2.48.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev20240509-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20240415-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240229-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240423-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240218-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v2-rev393-1.25.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240430-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240419-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240521-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20210624-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -144,9 +142,9 @@ com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationP com.google.guava:guava:33.2.0-android=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-apache-v2:1.43.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-appengine:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-gson:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-apache-v2:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-appengine:1.43.3=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-gson:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client-jackson2:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client-protobuf:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -158,7 +156,6 @@ com.google.j2objc:j2objc-annotations:3.0.0=deploy_jar,runtimeClasspath,testRunti com.google.jsinterop:jsinterop-annotations:2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.monitoring-client:metrics:1.0.7=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.monitoring-client:stackdriver:1.0.7=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.oauth-client:google-oauth-client-appengine:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-java6:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-jetty:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -311,8 +308,8 @@ org.codehaus.mojo:animal-sniffer-annotations:1.23=deploy_jar,runtimeClasspath,te org.conscrypt:conscrypt-openjdk-uber:2.5.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.13.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.13.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.14.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.14.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/load-testing/buildscript-gradle.lockfile b/load-testing/buildscript-gradle.lockfile new file mode 100644 index 000000000..0d156738b --- /dev/null +++ b/load-testing/buildscript-gradle.lockfile @@ -0,0 +1,4 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +empty=classpath diff --git a/load-testing/gradle.lockfile b/load-testing/gradle.lockfile new file mode 100644 index 000000000..b6b13aa93 --- /dev/null +++ b/load-testing/gradle.lockfile @@ -0,0 +1,69 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +aopalliance:aopalliance:1.0=annotationProcessor,errorprone,testAnnotationProcessor +com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,testAnnotationProcessor +com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor +com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor +com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor +com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.26.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.7.1=checkstyle +com.google.errorprone:error_prone_check_api:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor +com.google.errorprone:error_prone_core:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor +com.google.errorprone:error_prone_type_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor +com.google.errorprone:javac:9+181-r4173-1=errorproneJavac +com.google.flogger:flogger-system-backend:0.8=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.flogger:flogger:0.8=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,checkstyle,errorprone,testAnnotationProcessor +com.google.guava:failureaccess:1.0.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor +com.google.guava:guava:31.0.1-jre=checkstyle +com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor +com.google.guava:guava:33.2.1-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:1.3=checkstyle +com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath +com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor +com.puppycrawl.tools:checkstyle:9.3=checkstyle +commons-beanutils:commons-beanutils:1.9.4=checkstyle +commons-collections:commons-collections:3.2.2=checkstyle +info.picocli:picocli:4.6.2=checkstyle +io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor +io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor +io.netty:netty-buffer:4.1.110.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.110.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.110.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.110.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.110.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.110.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.110.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.110.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor +joda-time:joda-time:2.12.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.sf.saxon:Saxon-HE:10.6=checkstyle +org.antlr:antlr4-runtime:4.9.3=checkstyle +org.bouncycastle:bcpg-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcpkix-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcprov-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcutil-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.12.0=checkstyle +org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor +org.checkerframework:checker-qual:3.42.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.11=jacocoAnt +org.jacoco:org.jacoco.core:0.8.11=jacocoAnt +org.jacoco:org.jacoco.report:0.8.11=jacocoAnt +org.javassist:javassist:3.28.0-GA=checkstyle +org.jcommander:jcommander:1.83=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.6=jacocoAnt +org.ow2.asm:asm-tree:9.6=jacocoAnt +org.ow2.asm:asm:9.6=jacocoAnt +org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotationProcessor +org.reflections:reflections:0.10.2=checkstyle +empty= diff --git a/networking/gradle.lockfile b/networking/gradle.lockfile index 0c6d95bb3..921c68934 100644 --- a/networking/gradle.lockfile +++ b/networking/gradle.lockfile @@ -10,7 +10,7 @@ com.github.docker-java:docker-java-transport-zerodep:3.3.6=testCompileClasspath, com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.android:annotations:4.1.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client:1.35.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.6.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2:2.44.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.134.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.134.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -25,7 +25,7 @@ com.google.auth:google-auth-library-oauth2-http:1.23.0=deploy_jar,runtimeClasspa com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.10.4=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor -com.google.auto.value:auto-value:1.10.4=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auto.value:auto-value:1.11.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.cloud:google-cloud-tasks:2.44.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath @@ -54,15 +54,15 @@ com.google.guava:guava:31.0.1-jre=checkstyle com.google.guava:guava:32.1.1-jre=errorprone com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor com.google.guava:guava:33.1.0-jre=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.guava:guava:33.2.0-jre=compileClasspath,testCompileClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,testCompileClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-apache-v2:1.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-gson:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.http-client:google-http-client:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-apache-v2:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-gson:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.j2objc:j2objc-annotations:1.3=checkstyle com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.oauth-client:google-oauth-client:1.34.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.oauth-client:google-oauth-client:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor com.google.protobuf:protobuf-java:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/prober/gradle.lockfile b/prober/gradle.lockfile index 9616ed056..99b88a27e 100644 --- a/prober/gradle.lockfile +++ b/prober/gradle.lockfile @@ -10,7 +10,7 @@ com.github.docker-java:docker-java-transport-zerodep:3.3.6=testCompileClasspath, com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.android:annotations:4.1.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client:1.35.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.6.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2:2.44.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.134.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.134.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -23,9 +23,10 @@ com.google.api:gax:2.48.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auth:google-auth-library-credentials:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auth:google-auth-library-oauth2-http:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.value:auto-value-annotations:1.10.4=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.value:auto-value-annotations:1.11.0=compileClasspath com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor -com.google.auto.value:auto-value:1.10.4=annotationProcessor,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath +com.google.auto.value:auto-value:1.11.0=annotationProcessor,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.cloud:google-cloud-tasks:2.44.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath @@ -55,17 +56,17 @@ com.google.guava:guava:31.0.1-jre=checkstyle com.google.guava:guava:32.1.1-jre=errorprone com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor com.google.guava:guava:33.1.0-jre=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.guava:guava:33.2.0-jre=compileClasspath,testCompileClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,testCompileClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-apache-v2:1.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-gson:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.http-client:google-http-client:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-apache-v2:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-gson:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.j2objc:j2objc-annotations:1.3=checkstyle com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:contrib:1.0.7=testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:metrics:1.0.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.oauth-client:google-oauth-client:1.34.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.oauth-client:google-oauth-client:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor com.google.protobuf:protobuf-java:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/processor/gradle.lockfile b/processor/gradle.lockfile index 805b44206..fc07ef01c 100644 --- a/processor/gradle.lockfile +++ b/processor/gradle.lockfile @@ -21,7 +21,7 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,deploy_jar,runtimeClasspat com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor com.google.guava:guava:31.0.1-jre=checkstyle com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor -com.google.guava:guava:33.2.0-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.j2objc:j2objc-annotations:1.3=checkstyle diff --git a/proxy/gradle.lockfile b/proxy/gradle.lockfile index d323b42d1..64e6af050 100644 --- a/proxy/gradle.lockfile +++ b/proxy/gradle.lockfile @@ -12,7 +12,7 @@ com.github.docker-java:docker-java-transport-zerodep:3.3.6=testCompileClasspath, com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.android:annotations:4.1.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client:1.35.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.5.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:gapic-google-cloud-storage-v2:2.39.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-storage-v2:2.39.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-storage-v2:2.39.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -33,7 +33,7 @@ com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,deploy_j com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor -com.google.auto.value:auto-value:1.10.4=annotationProcessor,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath +com.google.auto.value:auto-value:1.11.0=annotationProcessor,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.cloud:google-cloud-core-grpc:2.38.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-core-http:2.38.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -64,13 +64,13 @@ com.google.guava:guava-parent:32.1.1-jre=errorprone com.google.guava:guava:31.0.1-jre=checkstyle com.google.guava:guava:32.1.1-jre=errorprone com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.1.0-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.0-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-appengine:1.44.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-gson:1.44.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-gson:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-jackson2:1.44.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client:1.44.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.j2objc:j2objc-annotations:1.3=checkstyle com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/backend/gradle.lockfile b/services/backend/gradle.lockfile index a05cd10ac..7e8e0f506 100644 --- a/services/backend/gradle.lockfile +++ b/services/backend/gradle.lockfile @@ -27,11 +27,10 @@ com.github.jnr:jnr-posix:3.1.19=compileClasspath,runtimeClasspath,testCompileCla com.github.jnr:jnr-unixsocket:0.38.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client-appengine:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api-client:google-api-client:1.35.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:gapic-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.176.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -72,12 +71,11 @@ com.google.api:gax-grpc:2.48.1=compileClasspath,runtimeClasspath,testCompileClas com.google.api:gax-httpjson:2.48.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api:gax:2.48.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev20240509-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20240415-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240229-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240423-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240218-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v2-rev393-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240430-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240419-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240521-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20210624-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -130,9 +128,9 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompi com.google.guava:guava:33.2.0-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-apache-v2:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-appengine:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-gson:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-appengine:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-gson:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-jackson2:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-protobuf:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -142,7 +140,6 @@ com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,runtimeClasspath,tes com.google.jsinterop:jsinterop-annotations:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:metrics:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:stackdriver:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.oauth-client:google-oauth-client-appengine:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-java6:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-jetty:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -286,8 +283,8 @@ org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeCl org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/bsa/gradle.lockfile b/services/bsa/gradle.lockfile index a05cd10ac..7e8e0f506 100644 --- a/services/bsa/gradle.lockfile +++ b/services/bsa/gradle.lockfile @@ -27,11 +27,10 @@ com.github.jnr:jnr-posix:3.1.19=compileClasspath,runtimeClasspath,testCompileCla com.github.jnr:jnr-unixsocket:0.38.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client-appengine:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api-client:google-api-client:1.35.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:gapic-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.176.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -72,12 +71,11 @@ com.google.api:gax-grpc:2.48.1=compileClasspath,runtimeClasspath,testCompileClas com.google.api:gax-httpjson:2.48.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api:gax:2.48.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev20240509-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20240415-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240229-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240423-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240218-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v2-rev393-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240430-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240419-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240521-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20210624-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -130,9 +128,9 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompi com.google.guava:guava:33.2.0-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-apache-v2:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-appengine:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-gson:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-appengine:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-gson:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-jackson2:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-protobuf:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -142,7 +140,6 @@ com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,runtimeClasspath,tes com.google.jsinterop:jsinterop-annotations:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:metrics:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:stackdriver:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.oauth-client:google-oauth-client-appengine:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-java6:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-jetty:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -286,8 +283,8 @@ org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeCl org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/default/gradle.lockfile b/services/default/gradle.lockfile index a05cd10ac..7e8e0f506 100644 --- a/services/default/gradle.lockfile +++ b/services/default/gradle.lockfile @@ -27,11 +27,10 @@ com.github.jnr:jnr-posix:3.1.19=compileClasspath,runtimeClasspath,testCompileCla com.github.jnr:jnr-unixsocket:0.38.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client-appengine:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api-client:google-api-client:1.35.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:gapic-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.176.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -72,12 +71,11 @@ com.google.api:gax-grpc:2.48.1=compileClasspath,runtimeClasspath,testCompileClas com.google.api:gax-httpjson:2.48.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api:gax:2.48.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev20240509-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20240415-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240229-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240423-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240218-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v2-rev393-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240430-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240419-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240521-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20210624-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -130,9 +128,9 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompi com.google.guava:guava:33.2.0-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-apache-v2:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-appengine:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-gson:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-appengine:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-gson:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-jackson2:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-protobuf:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -142,7 +140,6 @@ com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,runtimeClasspath,tes com.google.jsinterop:jsinterop-annotations:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:metrics:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:stackdriver:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.oauth-client:google-oauth-client-appengine:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-java6:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-jetty:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -286,8 +283,8 @@ org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeCl org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/pubapi/gradle.lockfile b/services/pubapi/gradle.lockfile index a05cd10ac..7e8e0f506 100644 --- a/services/pubapi/gradle.lockfile +++ b/services/pubapi/gradle.lockfile @@ -27,11 +27,10 @@ com.github.jnr:jnr-posix:3.1.19=compileClasspath,runtimeClasspath,testCompileCla com.github.jnr:jnr-unixsocket:0.38.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client-appengine:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api-client:google-api-client:1.35.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:gapic-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.176.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -72,12 +71,11 @@ com.google.api:gax-grpc:2.48.1=compileClasspath,runtimeClasspath,testCompileClas com.google.api:gax-httpjson:2.48.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api:gax:2.48.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev20240509-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20240415-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240229-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240423-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240218-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v2-rev393-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240430-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240419-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240521-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20210624-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -130,9 +128,9 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompi com.google.guava:guava:33.2.0-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-apache-v2:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-appengine:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-gson:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-appengine:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-gson:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-jackson2:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-protobuf:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -142,7 +140,6 @@ com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,runtimeClasspath,tes com.google.jsinterop:jsinterop-annotations:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:metrics:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:stackdriver:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.oauth-client:google-oauth-client-appengine:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-java6:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-jetty:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -286,8 +283,8 @@ org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeCl org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/tools/gradle.lockfile b/services/tools/gradle.lockfile index a05cd10ac..7e8e0f506 100644 --- a/services/tools/gradle.lockfile +++ b/services/tools/gradle.lockfile @@ -27,11 +27,10 @@ com.github.jnr:jnr-posix:3.1.19=compileClasspath,runtimeClasspath,testCompileCla com.github.jnr:jnr-unixsocket:0.38.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client-appengine:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api-client:google-api-client:1.35.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:gapic-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.176.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -72,12 +71,11 @@ com.google.api:gax-grpc:2.48.1=compileClasspath,runtimeClasspath,testCompileClas com.google.api:gax-httpjson:2.48.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api:gax:2.48.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-admin-directory:directory_v1-rev20240509-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-appengine:v1-rev20240415-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240229-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240423-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240218-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v2-rev393-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240430-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240419-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240521-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20210624-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -130,9 +128,9 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompi com.google.guava:guava:33.2.0-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-apache-v2:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-appengine:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-gson:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-appengine:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-gson:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-jackson2:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-protobuf:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -142,7 +140,6 @@ com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,runtimeClasspath,tes com.google.jsinterop:jsinterop-annotations:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:metrics:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.monitoring-client:stackdriver:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.oauth-client:google-oauth-client-appengine:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-java6:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-jetty:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.oauth-client:google-oauth-client-servlet:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -286,8 +283,8 @@ org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeCl org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/util/gradle.lockfile b/util/gradle.lockfile index 51d19a735..7f4e35336 100644 --- a/util/gradle.lockfile +++ b/util/gradle.lockfile @@ -10,7 +10,7 @@ com.github.docker-java:docker-java-transport-zerodep:3.3.6=testCompileClasspath, com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.android:annotations:4.1.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api-client:google-api-client:1.35.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api-client:google-api-client:2.6.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2:2.44.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.134.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.134.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -25,7 +25,7 @@ com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,deploy_j com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor -com.google.auto.value:auto-value:1.10.4=annotationProcessor,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath +com.google.auto.value:auto-value:1.11.0=annotationProcessor,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.cloud:google-cloud-tasks:2.44.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath @@ -49,20 +49,20 @@ com.google.googlejavaformat:google-java-format:1.5=annotationProcessor,testAnnot com.google.guava:failureaccess:1.0.1=checkstyle,errorprone com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.guava:guava-parent:32.1.1-jre=errorprone -com.google.guava:guava-testlib:33.2.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava-testlib:33.2.1-jre=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:31.0.1-jre=checkstyle com.google.guava:guava:32.1.1-jre=errorprone com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor com.google.guava:guava:33.1.0-jre=compileClasspath,deploy_jar,runtimeClasspath -com.google.guava:guava:33.2.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-apache-v2:1.42.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-gson:1.44.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client:1.44.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-gson:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.j2objc:j2objc-annotations:1.3=checkstyle com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.oauth-client:google-oauth-client:1.34.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.oauth-client:google-oauth-client:1.36.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java-util:3.25.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor com.google.protobuf:protobuf-java:3.25.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath