From 352618b3b7da597e3126f138f9b11e49fbd0b6d5 Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Fri, 13 Sep 2024 12:06:50 -0400 Subject: [PATCH] Use Jcommander 2.0 (#2552) --- core/gradle.lockfile | 40 +++++++++---------- ...eateOrUpdateBulkPricingPackageCommand.java | 1 - .../tools/CreateOrUpdateDomainCommand.java | 2 +- .../tools/GenerateEscrowDepositCommand.java | 9 +++-- .../registry/tools/SetupOteCommand.java | 3 +- .../tools/UniformRapidSuspensionCommand.java | 2 +- .../registry/tools/UpdateDomainCommand.java | 4 +- .../GenerateEscrowDepositCommandTest.java | 19 ++++++--- db/buildscript-gradle.lockfile | 4 +- db/gradle.lockfile | 4 +- dependencies.gradle | 5 +-- jetty/gradle.lockfile | 38 +++++++++--------- load-testing/gradle.lockfile | 2 +- proxy/gradle.lockfile | 2 +- services/backend/gradle.lockfile | 38 +++++++++--------- services/bsa/gradle.lockfile | 38 +++++++++--------- services/default/gradle.lockfile | 38 +++++++++--------- services/pubapi/gradle.lockfile | 38 +++++++++--------- services/tools/gradle.lockfile | 38 +++++++++--------- 19 files changed, 166 insertions(+), 159 deletions(-) diff --git a/core/gradle.lockfile b/core/gradle.lockfile index 3811d12def8..f72933fac36 100644 --- a/core/gradle.lockfile +++ b/core/gradle.lockfile @@ -186,7 +186,7 @@ com.google.http-client:google-http-client-apache-v2:1.45.0=compileClasspath,depl 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.2=testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:1.45.0=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 +com.google.http-client:google-http-client-jackson2:1.43.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.http-client:google-http-client-jackson2:1.44.2=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.45.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -378,24 +378,24 @@ org.apache.arrow:arrow-format:15.0.2=compileClasspath,deploy_jar,nonprodCompileC org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-runners-core-construction-java:2.54.0=testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-direct-java:2.58.1=testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-direct-java:2.59.0=testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-sdks-java-fn-execution:2.54.0=testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.59.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -442,8 +442,8 @@ org.eclipse.jetty:jetty-server:12.0.13=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.13=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.13=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-xml:12.0.13=testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.17.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.17.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.18.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.18.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-core:4.0.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:4.0.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:4.0.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -464,7 +464,7 @@ org.jacoco:org.jacoco.core:0.8.12=jacocoAnt org.jacoco:org.jacoco.report:0.8.12=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle org.jboss.logging:jboss-logging:3.5.0.Final=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -org.jcommander:jcommander:1.83=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jcommander:jcommander:2.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.6.10=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlin:kotlin-reflect:1.9.20=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/core/src/main/java/google/registry/tools/CreateOrUpdateBulkPricingPackageCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateBulkPricingPackageCommand.java index d2e08a9e034..a7605577176 100644 --- a/core/src/main/java/google/registry/tools/CreateOrUpdateBulkPricingPackageCommand.java +++ b/core/src/main/java/google/registry/tools/CreateOrUpdateBulkPricingPackageCommand.java @@ -56,7 +56,6 @@ abstract class CreateOrUpdateBulkPricingPackageCommand extends MutatingCommand { @Nullable @Parameter( names = "--next_billing_date", - converter = DateTimeParameter.class, validateWith = DateTimeParameter.class, description = "The next date that the bulk pricing package should be billed for its annual fee") diff --git a/core/src/main/java/google/registry/tools/CreateOrUpdateDomainCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateDomainCommand.java index 21cdef9243e..70ba1f85295 100644 --- a/core/src/main/java/google/registry/tools/CreateOrUpdateDomainCommand.java +++ b/core/src/main/java/google/registry/tools/CreateOrUpdateDomainCommand.java @@ -43,7 +43,7 @@ abstract class CreateOrUpdateDomainCommand extends MutatingEppToolCommand { @Parameter( names = {"-n", "--nameservers"}, description = "Comma-delimited list of nameservers, up to 13.", - converter = NameserversParameter.class, + listConverter = NameserversParameter.class, validateWith = NameserversParameter.class) Set nameservers = new HashSet<>(); diff --git a/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java b/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java index 320a789205f..3b8ceeb40c3 100644 --- a/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java +++ b/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java @@ -32,7 +32,6 @@ import google.registry.model.rde.RdeMode; import google.registry.rde.RdeStagingAction; import google.registry.request.Action.Service; -import google.registry.tools.params.DateTimeParameter; import java.util.List; import java.util.stream.Collectors; import javax.inject.Inject; @@ -54,8 +53,7 @@ final class GenerateEscrowDepositCommand implements Command { @Parameter( names = {"-w", "--watermark"}, description = "Point-in-time timestamp(s) for which time the deposit should be generated", - required = true, - converter = DateTimeParameter.class) + required = true) private List watermarks; @Parameter( @@ -85,7 +83,12 @@ final class GenerateEscrowDepositCommand implements Command { @Override public void run() { + if (watermarks.isEmpty()) { + throw new ParameterException("At least one watermark must be specified"); + } + // We need to test for cases where "--watermark=" is passed in as a parameter, because it would + // first be converted to an empty list, and as such the DateTime converter would not be called. if (tlds.isEmpty()) { throw new ParameterException("At least one TLD must be specified"); } diff --git a/core/src/main/java/google/registry/tools/SetupOteCommand.java b/core/src/main/java/google/registry/tools/SetupOteCommand.java index 40d3a3f2bb4..a4a3f2504f1 100644 --- a/core/src/main/java/google/registry/tools/SetupOteCommand.java +++ b/core/src/main/java/google/registry/tools/SetupOteCommand.java @@ -30,7 +30,6 @@ import google.registry.util.RegistryEnvironment; import google.registry.util.StringGenerator; import java.nio.file.Path; -import java.util.ArrayList; import java.util.List; import java.util.Optional; import javax.inject.Inject; @@ -52,7 +51,7 @@ final class SetupOteCommand extends ConfirmingCommand { names = {"-a", "--ip_allow_list"}, description = "Comma-separated list of IP addresses or CIDR ranges.", required = true) - private List ipAllowList = new ArrayList<>(); + private List ipAllowList; @Parameter( names = {"--email"}, diff --git a/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java b/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java index 52300bb6cbb..7ae3f52dd73 100644 --- a/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java +++ b/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java @@ -73,7 +73,7 @@ final class UniformRapidSuspensionCommand extends MutatingEppToolCommand { description = "Comma-delimited set of fully qualified host names to replace the current hosts" + " on the domain.", - converter = NameserversParameter.class, + listConverter = NameserversParameter.class, validateWith = NameserversParameter.class) private Set newHosts = new HashSet<>(); diff --git a/core/src/main/java/google/registry/tools/UpdateDomainCommand.java b/core/src/main/java/google/registry/tools/UpdateDomainCommand.java index 9db8d1ebe06..9351d6aee95 100644 --- a/core/src/main/java/google/registry/tools/UpdateDomainCommand.java +++ b/core/src/main/java/google/registry/tools/UpdateDomainCommand.java @@ -64,7 +64,7 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand { description = "Comma-delimited list of nameservers to add, up to 13. " + "Cannot be set if --nameservers is set.", - converter = NameserversParameter.class, + listConverter = NameserversParameter.class, validateWith = NameserversParameter.class) private Set addNameservers = new HashSet<>(); @@ -95,7 +95,7 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand { description = "Comma-delimited list of nameservers to remove, up to 13. " + "Cannot be set if --nameservers is set.", - converter = NameserversParameter.class, + listConverter = NameserversParameter.class, validateWith = NameserversParameter.class) private Set removeNameservers = new HashSet<>(); diff --git a/core/src/test/java/google/registry/tools/GenerateEscrowDepositCommandTest.java b/core/src/test/java/google/registry/tools/GenerateEscrowDepositCommandTest.java index c19c9331097..829c81a8714 100644 --- a/core/src/test/java/google/registry/tools/GenerateEscrowDepositCommandTest.java +++ b/core/src/test/java/google/registry/tools/GenerateEscrowDepositCommandTest.java @@ -53,9 +53,9 @@ void testCommand_missingTld() { @Test void testCommand_emptyTld() { - IllegalArgumentException thrown = + ParameterException thrown = assertThrows( - IllegalArgumentException.class, + ParameterException.class, () -> runCommand( "--tld=", @@ -63,7 +63,7 @@ void testCommand_emptyTld() { "--mode=thin", "-r 42", "-o test")); - assertThat(thrown).hasMessageThat().contains("Null or empty TLD specified"); + assertThat(thrown).hasMessageThat().contains("At least one TLD must be specified"); } @Test @@ -94,11 +94,20 @@ void testCommand_missingWatermark() { @Test void testCommand_emptyWatermark() { + ParameterException thrown = + assertThrows( + ParameterException.class, + () -> runCommand("--tld=tld", "--watermark=", "--mode=full", "-r 42", "-o test")); + assertThat(thrown).hasMessageThat().contains("At least one watermark must be specified"); + } + + @Test + void testCommand_malformedWatermark() { IllegalArgumentException thrown = assertThrows( IllegalArgumentException.class, - () -> runCommand("--tld=tld", "--watermark=", "--mode=full", "-r 42", "-o test")); - assertThat(thrown).hasMessageThat().contains("Invalid format: \"\""); + () -> runCommand("--tld=tld", "--watermark=blah", "--mode=full", "-r 42", "-o test")); + assertThat(thrown).hasMessageThat().contains("Invalid format: \"blah\""); } @Test diff --git a/db/buildscript-gradle.lockfile b/db/buildscript-gradle.lockfile index 616c2e4aadb..83a94e53b9f 100644 --- a/db/buildscript-gradle.lockfile +++ b/db/buildscript-gradle.lockfile @@ -9,6 +9,6 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=classpath com.fasterxml.jackson:jackson-bom:2.15.2=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.17.3=classpath -org.flywaydb:flyway-database-postgresql:10.17.3=classpath +org.flywaydb:flyway-core:10.18.0=classpath +org.flywaydb:flyway-database-postgresql:10.18.0=classpath empty= diff --git a/db/gradle.lockfile b/db/gradle.lockfile index 17dbf01636d..85ac84c66c1 100644 --- a/db/gradle.lockfile +++ b/db/gradle.lockfile @@ -91,8 +91,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.17.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.17.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.18.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.18.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.12=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.12=jacocoAnt diff --git a/dependencies.gradle b/dependencies.gradle index adb5f817bd8..06c533ac37e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -49,10 +49,6 @@ ext { // CAPPED VERSIONS START HERE. - // 2.0+ versions of jcommander have breaking changes that impact how - // collections are parsed. - 'org.jcommander:jcommander:[1.83, 2.0)!!', - // 6.6 is alpha. 'org.hibernate.orm:hibernate-core:[6.0,6.6)!!', 'org.hibernate.orm:hibernate-hikaricp:[6.0,6.6)!!', @@ -202,6 +198,7 @@ ext { 'org.hamcrest:hamcrest-core:[2.2,)', 'org.hamcrest:hamcrest-library:[2.2,)', 'org.hamcrest:hamcrest:[2.2,)', + 'org.jcommander:jcommander:[2.0,)', 'org.jline:jline:[3.0,)', 'org.joda:joda-money:[1.0.1,)', 'org.json:json:[20160810,)', diff --git a/jetty/gradle.lockfile b/jetty/gradle.lockfile index 2011f4ae6ba..f59770aa040 100644 --- a/jetty/gradle.lockfile +++ b/jetty/gradle.lockfile @@ -144,7 +144,7 @@ com.google.gwt:gwt-user:2.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.45.0=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.45.0=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-jackson2:1.43.3=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.45.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.inject.extensions:guice-multibindings:4.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -284,21 +284,21 @@ org.apache.arrow:arrow-format:15.0.2=deploy_jar,runtimeClasspath,testRuntimeClas org.apache.arrow:arrow-memory-core:15.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -320,8 +320,8 @@ org.eclipse.angus:angus-activation:2.0.2=deploy_jar,runtimeClasspath,testRuntime org.eclipse.angus:jakarta.mail:2.0.3=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.17.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.17.3=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.18.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.18.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-core:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -338,7 +338,7 @@ org.jacoco:org.jacoco.core:0.8.12=jacocoAnt org.jacoco:org.jacoco.report:0.8.12=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle org.jboss.logging:jboss-logging:3.5.0.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.jcommander:jcommander:1.83=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.jcommander:jcommander:2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/load-testing/gradle.lockfile b/load-testing/gradle.lockfile index 77c70f666a7..551cfb51b81 100644 --- a/load-testing/gradle.lockfile +++ b/load-testing/gradle.lockfile @@ -60,7 +60,7 @@ org.jacoco:org.jacoco.ant:0.8.12=jacocoAnt org.jacoco:org.jacoco.core:0.8.12=jacocoAnt org.jacoco:org.jacoco.report:0.8.12=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle -org.jcommander:jcommander:1.83=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jcommander:jcommander:2.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.7=jacocoAnt org.ow2.asm:asm-tree:9.7=jacocoAnt org.ow2.asm:asm:9.7=jacocoAnt diff --git a/proxy/gradle.lockfile b/proxy/gradle.lockfile index 4c3c9bc3971..8f291df138c 100644 --- a/proxy/gradle.lockfile +++ b/proxy/gradle.lockfile @@ -205,7 +205,7 @@ org.jacoco:org.jacoco.ant:0.8.12=jacocoAnt org.jacoco:org.jacoco.core:0.8.12=jacocoAnt org.jacoco:org.jacoco.report:0.8.12=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle -org.jcommander:jcommander:1.83=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jcommander:jcommander:2.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.6.10=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=annotationProcessor,testAnnotationProcessor diff --git a/services/backend/gradle.lockfile b/services/backend/gradle.lockfile index ed05e9ddfd7..40d3ea99377 100644 --- a/services/backend/gradle.lockfile +++ b/services/backend/gradle.lockfile @@ -128,7 +128,7 @@ com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClas com.google.http-client:google-http-client-apache-v2:1.45.0=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.45.0=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-jackson2:1.43.3=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.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-multibindings:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -262,21 +262,21 @@ org.apache.arrow:arrow-format:15.0.2=compileClasspath,runtimeClasspath,testCompi org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -297,8 +297,8 @@ org.eclipse.angus:angus-activation:2.0.2=runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=runtimeClasspath,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.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-core:4.0.2=runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:4.0.2=runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:4.0.2=runtimeClasspath,testRuntimeClasspath @@ -309,7 +309,7 @@ org.hibernate.orm:hibernate-ant:6.5.2.Final=compileClasspath,runtimeClasspath,te org.hibernate.orm:hibernate-core:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jboss.logging:jboss-logging:3.5.0.Final=runtimeClasspath,testRuntimeClasspath -org.jcommander:jcommander:1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jcommander:jcommander:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/bsa/gradle.lockfile b/services/bsa/gradle.lockfile index ed05e9ddfd7..40d3ea99377 100644 --- a/services/bsa/gradle.lockfile +++ b/services/bsa/gradle.lockfile @@ -128,7 +128,7 @@ com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClas com.google.http-client:google-http-client-apache-v2:1.45.0=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.45.0=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-jackson2:1.43.3=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.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-multibindings:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -262,21 +262,21 @@ org.apache.arrow:arrow-format:15.0.2=compileClasspath,runtimeClasspath,testCompi org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -297,8 +297,8 @@ org.eclipse.angus:angus-activation:2.0.2=runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=runtimeClasspath,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.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-core:4.0.2=runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:4.0.2=runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:4.0.2=runtimeClasspath,testRuntimeClasspath @@ -309,7 +309,7 @@ org.hibernate.orm:hibernate-ant:6.5.2.Final=compileClasspath,runtimeClasspath,te org.hibernate.orm:hibernate-core:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jboss.logging:jboss-logging:3.5.0.Final=runtimeClasspath,testRuntimeClasspath -org.jcommander:jcommander:1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jcommander:jcommander:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/default/gradle.lockfile b/services/default/gradle.lockfile index ed05e9ddfd7..40d3ea99377 100644 --- a/services/default/gradle.lockfile +++ b/services/default/gradle.lockfile @@ -128,7 +128,7 @@ com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClas com.google.http-client:google-http-client-apache-v2:1.45.0=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.45.0=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-jackson2:1.43.3=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.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-multibindings:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -262,21 +262,21 @@ org.apache.arrow:arrow-format:15.0.2=compileClasspath,runtimeClasspath,testCompi org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -297,8 +297,8 @@ org.eclipse.angus:angus-activation:2.0.2=runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=runtimeClasspath,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.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-core:4.0.2=runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:4.0.2=runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:4.0.2=runtimeClasspath,testRuntimeClasspath @@ -309,7 +309,7 @@ org.hibernate.orm:hibernate-ant:6.5.2.Final=compileClasspath,runtimeClasspath,te org.hibernate.orm:hibernate-core:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jboss.logging:jboss-logging:3.5.0.Final=runtimeClasspath,testRuntimeClasspath -org.jcommander:jcommander:1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jcommander:jcommander:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/pubapi/gradle.lockfile b/services/pubapi/gradle.lockfile index ed05e9ddfd7..40d3ea99377 100644 --- a/services/pubapi/gradle.lockfile +++ b/services/pubapi/gradle.lockfile @@ -128,7 +128,7 @@ com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClas com.google.http-client:google-http-client-apache-v2:1.45.0=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.45.0=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-jackson2:1.43.3=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.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-multibindings:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -262,21 +262,21 @@ org.apache.arrow:arrow-format:15.0.2=compileClasspath,runtimeClasspath,testCompi org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -297,8 +297,8 @@ org.eclipse.angus:angus-activation:2.0.2=runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=runtimeClasspath,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.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-core:4.0.2=runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:4.0.2=runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:4.0.2=runtimeClasspath,testRuntimeClasspath @@ -309,7 +309,7 @@ org.hibernate.orm:hibernate-ant:6.5.2.Final=compileClasspath,runtimeClasspath,te org.hibernate.orm:hibernate-core:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jboss.logging:jboss-logging:3.5.0.Final=runtimeClasspath,testRuntimeClasspath -org.jcommander:jcommander:1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jcommander:jcommander:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/tools/gradle.lockfile b/services/tools/gradle.lockfile index ed05e9ddfd7..40d3ea99377 100644 --- a/services/tools/gradle.lockfile +++ b/services/tools/gradle.lockfile @@ -128,7 +128,7 @@ com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClas com.google.http-client:google-http-client-apache-v2:1.45.0=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.45.0=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-jackson2:1.43.3=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.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject.extensions:guice-multibindings:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -262,21 +262,21 @@ org.apache.arrow:arrow-format:15.0.2=compileClasspath,runtimeClasspath,testCompi org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.59.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -297,8 +297,8 @@ org.eclipse.angus:angus-activation:2.0.2=runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=runtimeClasspath,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.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-core:4.0.2=runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:4.0.2=runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:4.0.2=runtimeClasspath,testRuntimeClasspath @@ -309,7 +309,7 @@ org.hibernate.orm:hibernate-ant:6.5.2.Final=compileClasspath,runtimeClasspath,te org.hibernate.orm:hibernate-core:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jboss.logging:jboss-logging:3.5.0.Final=runtimeClasspath,testRuntimeClasspath -org.jcommander:jcommander:1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jcommander:jcommander:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath