From 9ea6e49eb4491b716bccbc62a8ecb09fbf598762 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Fri, 22 Nov 2024 15:07:28 -0500 Subject: [PATCH 1/3] Test with final webservice release --- THIRD-PARTY-LICENSES.txt | 105 ++++++++++-------- .../generated/src/main/resources/pom.xml | 8 +- .../generated/src/main/resources/pom.xml | 4 +- .../generated/src/main/resources/pom.xml | 16 +-- pom.xml | 2 +- support/generated/src/main/resources/pom.xml | 16 +-- 6 files changed, 80 insertions(+), 71 deletions(-) diff --git a/THIRD-PARTY-LICENSES.txt b/THIRD-PARTY-LICENSES.txt index ac80aefbe..414a32e15 100644 --- a/THIRD-PARTY-LICENSES.txt +++ b/THIRD-PARTY-LICENSES.txt @@ -1,5 +1,5 @@ -Lists of 394 third-party dependencies. +Lists of 403 third-party dependencies. (Apache License, Version 2.0) akka-actor (com.typesafe.akka:akka-actor_2.13:2.5.32 - https://akka.io/) (Apache License, Version 2.0) akka-protobuf (com.typesafe.akka:akka-protobuf_2.13:2.5.32 - https://akka.io/) (Apache License, Version 2.0) akka-slf4j (com.typesafe.akka:akka-slf4j_2.13:2.5.32 - https://akka.io/) @@ -11,7 +11,7 @@ Lists of 394 third-party dependencies. (EPL 2.0) (GPL2 w/ CPE) aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:3.0.4 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged) (Apache-2.0) Apache Avro (org.apache.avro:avro:1.11.3 - https://avro.apache.org) (Apache License, Version 2.0) Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.4 - https://commons.apache.org/proper/commons-beanutils/) - (Apache License, Version 2.0) Apache Commons Codec (commons-codec:commons-codec:1.15 - https://commons.apache.org/proper/commons-codec/) + (Apache-2.0) Apache Commons Codec (commons-codec:commons-codec:1.17.1 - https://commons.apache.org/proper/commons-codec/) (Apache License, Version 2.0) Apache Commons Collections (commons-collections:commons-collections:3.2.2 - http://commons.apache.org/collections/) (Apache License, Version 2.0) Apache Commons Collections (org.apache.commons:commons-collections4:4.4 - https://commons.apache.org/proper/commons-collections/) (Apache-2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.26.0 - https://commons.apache.org/proper/commons-compress/) @@ -43,33 +43,44 @@ Lists of 394 third-party dependencies. (Apache License 2.0) Asynchronous Http Client Netty Utils (org.asynchttpclient:async-http-client-netty-utils:2.10.3 - http://github.com/AsyncHttpClient/async-http-client/async-http-client-netty-utils) (Apache 2.0) AutoValue Annotations (com.google.auto.value:auto-value-annotations:1.9 - https://github.com/google/auto/tree/master/value) (Apache License, Version 2.0) AWS Event Stream (software.amazon.eventstream:eventstream:1.0.1 - https://github.com/awslabs/aws-eventstream-java) - (Apache License, Version 2.0) AWS Java SDK :: Annotations (software.amazon.awssdk:annotations:2.17.186 - https://aws.amazon.com/sdkforjava/core/annotations) - (Apache License, Version 2.0) AWS Java SDK :: Arns (software.amazon.awssdk:arns:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Auth (software.amazon.awssdk:auth:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: AWS Core (software.amazon.awssdk:aws-core:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Core :: Protocols :: AWS Json Protocol (software.amazon.awssdk:aws-json-protocol:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Core :: Protocols :: AWS Query Protocol (software.amazon.awssdk:aws-query-protocol:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Core :: Protocols :: AWS Xml Protocol (software.amazon.awssdk:aws-xml-protocol:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Core :: Protocols :: Json Utils (software.amazon.awssdk:json-utils:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Core :: Protocols :: Protocol Core (software.amazon.awssdk:protocol-core:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: HTTP Client Interface (software.amazon.awssdk:http-client-spi:2.17.186 - https://aws.amazon.com/sdkforjava/http-client-spi) - (Apache License, Version 2.0) AWS Java SDK :: HTTP Clients :: Apache (software.amazon.awssdk:apache-client:2.17.186 - https://aws.amazon.com/sdkforjava/http-clients/apache-client) - (Apache License, Version 2.0) AWS Java SDK :: HTTP Clients :: Netty Non-Blocking I/O (software.amazon.awssdk:netty-nio-client:2.17.186 - https://aws.amazon.com/sdkforjava/http-clients/netty-nio-client) - (Apache License, Version 2.0) AWS Java SDK :: Metrics SPI (software.amazon.awssdk:metrics-spi:2.17.186 - https://aws.amazon.com/sdkforjava/core/metrics-spi) - (Apache License, Version 2.0) AWS Java SDK :: Profiles (software.amazon.awssdk:profiles:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Regions (software.amazon.awssdk:regions:2.17.186 - https://aws.amazon.com/sdkforjava/core/regions) - (Apache License, Version 2.0) AWS Java SDK :: SDK Core (software.amazon.awssdk:sdk-core:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Services :: Amazon CloudWatch (software.amazon.awssdk:cloudwatch:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Services :: Amazon EC2 (software.amazon.awssdk:ec2:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Services :: Amazon RDS (software.amazon.awssdk:rds:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Services :: Amazon S3 (software.amazon.awssdk:s3:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Services :: Amazon SQS (software.amazon.awssdk:sqs:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Services :: AWS CloudFormation (software.amazon.awssdk:cloudformation:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Services :: AWS Config (software.amazon.awssdk:config:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Services :: AWS IAM (software.amazon.awssdk:iam:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Services :: AWS Lambda (software.amazon.awssdk:lambda:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Third Party :: Jackson-core (software.amazon.awssdk:third-party-jackson-core:2.17.186 - https://aws.amazon.com/sdkforjava) - (Apache License, Version 2.0) AWS Java SDK :: Utilities (software.amazon.awssdk:utils:2.17.186 - https://aws.amazon.com/sdkforjava/utils) + (Apache License, Version 2.0) AWS Java SDK :: Annotations (software.amazon.awssdk:annotations:2.28.7 - https://aws.amazon.com/sdkforjava/core/annotations) + (Apache License, Version 2.0) AWS Java SDK :: Arns (software.amazon.awssdk:arns:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Auth (software.amazon.awssdk:auth:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: AWS Core (software.amazon.awssdk:aws-core:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: AWS CRT Core (software.amazon.awssdk:crt-core:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Checksums (software.amazon.awssdk:checksums:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Checksums SPI (software.amazon.awssdk:checksums-spi:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Core :: Protocols :: AWS Json Protocol (software.amazon.awssdk:aws-json-protocol:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Core :: Protocols :: AWS Query Protocol (software.amazon.awssdk:aws-query-protocol:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Core :: Protocols :: AWS Xml Protocol (software.amazon.awssdk:aws-xml-protocol:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Core :: Protocols :: Json Utils (software.amazon.awssdk:json-utils:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Core :: Protocols :: Protocol Core (software.amazon.awssdk:protocol-core:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Endpoints SPI (software.amazon.awssdk:endpoints-spi:2.28.7 - https://aws.amazon.com/sdkforjava/core/endpoints-spi) + (Apache License, Version 2.0) AWS Java SDK :: HTTP Auth (software.amazon.awssdk:http-auth:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: HTTP Auth AWS (software.amazon.awssdk:http-auth-aws:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: HTTP Auth Event Stream (software.amazon.awssdk:http-auth-aws-eventstream:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: HTTP Auth SPI (software.amazon.awssdk:http-auth-spi:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: HTTP Client Interface (software.amazon.awssdk:http-client-spi:2.28.7 - https://aws.amazon.com/sdkforjava/http-client-spi) + (Apache License, Version 2.0) AWS Java SDK :: HTTP Clients :: Apache (software.amazon.awssdk:apache-client:2.28.7 - https://aws.amazon.com/sdkforjava/http-clients/apache-client) + (Apache License, Version 2.0) AWS Java SDK :: HTTP Clients :: Netty Non-Blocking I/O (software.amazon.awssdk:netty-nio-client:2.28.7 - https://aws.amazon.com/sdkforjava/http-clients/netty-nio-client) + (Apache License, Version 2.0) AWS Java SDK :: Identity SPI (software.amazon.awssdk:identity-spi:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Metrics SPI (software.amazon.awssdk:metrics-spi:2.28.7 - https://aws.amazon.com/sdkforjava/core/metrics-spi) + (Apache License, Version 2.0) AWS Java SDK :: Profiles (software.amazon.awssdk:profiles:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Regions (software.amazon.awssdk:regions:2.28.7 - https://aws.amazon.com/sdkforjava/core/regions) + (Apache License, Version 2.0) AWS Java SDK :: Retries (software.amazon.awssdk:retries:2.28.7 - https://aws.amazon.com/sdkforjava/core/retries) + (Apache License, Version 2.0) AWS Java SDK :: Retries API (software.amazon.awssdk:retries-spi:2.28.7 - https://aws.amazon.com/sdkforjava/core/retries-spi) + (Apache License, Version 2.0) AWS Java SDK :: SDK Core (software.amazon.awssdk:sdk-core:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Services :: Amazon CloudWatch (software.amazon.awssdk:cloudwatch:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Services :: Amazon EC2 (software.amazon.awssdk:ec2:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Services :: Amazon RDS (software.amazon.awssdk:rds:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Services :: Amazon S3 (software.amazon.awssdk:s3:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Services :: Amazon SQS (software.amazon.awssdk:sqs:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Services :: AWS CloudFormation (software.amazon.awssdk:cloudformation:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Services :: AWS Config (software.amazon.awssdk:config:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Services :: AWS IAM (software.amazon.awssdk:iam:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Services :: AWS Lambda (software.amazon.awssdk:lambda:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Third Party :: Jackson-core (software.amazon.awssdk:third-party-jackson-core:2.28.7 - https://aws.amazon.com/sdkforjava) + (Apache License, Version 2.0) AWS Java SDK :: Utilities (software.amazon.awssdk:utils:2.28.7 - https://aws.amazon.com/sdkforjava/utils) (The Apache Software License, Version 2.0) AWS V4 Signer for Java (uk.co.lucasweb:aws-v4-signer-java:1.3 - https://github.com/lucasweb78/aws-v4-signer-java) (The Apache Software License, Version 2.0) Bean Validation API (javax.validation:validation-api:1.1.0.Final - http://beanvalidation.org) (MIT) better-files (com.github.pathikrit:better-files_2.13:3.9.1 - https://github.com/pathikrit/better-files) @@ -167,7 +178,7 @@ Lists of 394 third-party dependencies. (The Apache Software License, Version 2.0) Google OAuth Client Library for Java (com.google.oauth-client:google-oauth-client:1.34.0 - https://github.com/googleapis/google-oauth-java-client/google-oauth-client) (The Apache Software License, Version 2.0) Google OAuth2 API v2-rev151-1.25.0 (com.google.apis:google-api-services-oauth2:v2-rev151-1.25.0 - http://nexus.sonatype.org/oss-repository-hosting.html/google-api-services-oauth2) (The Apache Software License, Version 2.0) Graph Core (org.scala-graph:graph-core_2.13:1.13.1 - http://scala-graph.org) - (Apache-2.0) Gson (com.google.code.gson:gson:2.9.0 - https://github.com/google/gson/gson) + (Apache-2.0) Gson (com.google.code.gson:gson:2.10.1 - https://github.com/google/gson/gson) (The Apache Software License, Version 2.0) GSON extensions to the Google HTTP Client Library for Java. (com.google.http-client:google-http-client-gson:1.41.8 - https://github.com/googleapis/google-http-java-client/google-http-client-gson) (The Apache Software License, Version 2.0) Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess) (The Apache Software License, Version 2.0) Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture) @@ -310,24 +321,22 @@ Lists of 394 third-party dependencies. (The MIT License) mockito-inline (org.mockito:mockito-inline:3.12.4 - https://github.com/mockito/mockito) (Apache 2 License) Moneta Core (org.javamoney.moneta:moneta-core:1.4.2 - http://javamoney.org) (MIT) mouse (org.typelevel:mouse_2.13:1.0.11 - https://typelevel.org/mouse) - (Apache License, Version 2.0) Netty Reactive Streams HTTP support (com.typesafe.netty:netty-reactive-streams-http:2.0.5 - https://github.com/playframework/netty-reactive-streams/netty-reactive-streams-http) (Apache License, Version 2.0) Netty Reactive Streams Implementation (com.typesafe.netty:netty-reactive-streams:2.0.5 - https://github.com/playframework/netty-reactive-streams/netty-reactive-streams) - (Apache License, Version 2.0) Netty/Buffer (io.netty:netty-buffer:4.1.72.Final - https://netty.io/netty-buffer/) - (Apache License, Version 2.0) Netty/Codec (io.netty:netty-codec:4.1.72.Final - https://netty.io/netty-codec/) - (Apache License, Version 2.0) Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.72.Final - https://netty.io/netty-codec-dns/) - (Apache License, Version 2.0) Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.72.Final - https://netty.io/netty-codec-http/) - (Apache License, Version 2.0) Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.72.Final - https://netty.io/netty-codec-http2/) - (Apache License, Version 2.0) Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.72.Final - https://netty.io/netty-codec-socks/) - (Apache License, Version 2.0) Netty/Common (io.netty:netty-common:4.1.72.Final - https://netty.io/netty-common/) - (Apache License, Version 2.0) Netty/Handler (io.netty:netty-handler:4.1.72.Final - https://netty.io/netty-handler/) - (Apache License, Version 2.0) Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.72.Final - https://netty.io/netty-handler-proxy/) - (Apache License, Version 2.0) Netty/Resolver (io.netty:netty-resolver:4.1.72.Final - https://netty.io/netty-resolver/) - (Apache License, Version 2.0) Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.72.Final - https://netty.io/netty-resolver-dns/) - (https://github.com/netty/netty/blob/4.1/LICENSE.txt) Netty/TomcatNative [OpenSSL - Classes] (io.netty:netty-tcnative-classes:2.0.46.Final - https://github.com/netty/netty-tcnative/netty-tcnative-classes/) - (Apache License, Version 2.0) Netty/Transport (io.netty:netty-transport:4.1.72.Final - https://netty.io/netty-transport/) - (Apache License, Version 2.0) Netty/Transport/Classes/Epoll (io.netty:netty-transport-classes-epoll:4.1.72.Final - https://netty.io/netty-transport-classes-epoll/) - (Apache License, Version 2.0) Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.72.Final - https://netty.io/netty-transport-native-epoll/) - (Apache License, Version 2.0) Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.72.Final - https://netty.io/netty-transport-native-unix-common/) + (Apache License, Version 2.0) Netty/Buffer (io.netty:netty-buffer:4.1.112.Final - https://netty.io/netty-buffer/) + (Apache License, Version 2.0) Netty/Codec (io.netty:netty-codec:4.1.112.Final - https://netty.io/netty-codec/) + (Apache License, Version 2.0) Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.112.Final - https://netty.io/netty-codec-dns/) + (Apache License, Version 2.0) Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.112.Final - https://netty.io/netty-codec-http/) + (Apache License, Version 2.0) Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.112.Final - https://netty.io/netty-codec-http2/) + (Apache License, Version 2.0) Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.112.Final - https://netty.io/netty-codec-socks/) + (Apache License, Version 2.0) Netty/Common (io.netty:netty-common:4.1.112.Final - https://netty.io/netty-common/) + (Apache License, Version 2.0) Netty/Handler (io.netty:netty-handler:4.1.112.Final - https://netty.io/netty-handler/) + (Apache License, Version 2.0) Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.112.Final - https://netty.io/netty-handler-proxy/) + (Apache License, Version 2.0) Netty/Resolver (io.netty:netty-resolver:4.1.112.Final - https://netty.io/netty-resolver/) + (Apache License, Version 2.0) Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.112.Final - https://netty.io/netty-resolver-dns/) + (Apache License, Version 2.0) Netty/Transport (io.netty:netty-transport:4.1.112.Final - https://netty.io/netty-transport/) + (Apache License, Version 2.0) Netty/Transport/Classes/Epoll (io.netty:netty-transport-classes-epoll:4.1.112.Final - https://netty.io/netty-transport-classes-epoll/) + (Apache License, Version 2.0) Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.112.Final - https://netty.io/netty-transport-native-epoll/) + (Apache License, Version 2.0) Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.112.Final - https://netty.io/netty-transport-native-unix-common/) (Apache License, Version 2.0) Objenesis (org.objenesis:objenesis:3.2 - http://objenesis.org/objenesis) (The Apache Software License, Version 2.0) okhttp (com.squareup.okhttp3:okhttp:4.10.0 - https://square.github.io/okhttp/) (The Apache Software License, Version 2.0) okio (com.squareup.okio:okio-jvm:3.0.0 - https://github.com/square/okio/) @@ -352,7 +361,7 @@ Lists of 394 third-party dependencies. (The Apache Software License, Version 2.0) PowerMock (org.powermock:powermock-reflect:2.0.9 - http://www.powermock.org) (MIT) pprint_2.13 (com.lihaoyi:pprint_2.13:0.7.3 - https://github.com/lihaoyi/PPrint) (The Apache Software License, Version 2.0) rank-eval (org.elasticsearch.plugin:rank-eval-client:7.10.2 - https://github.com/elastic/elasticsearch) - (CC0) reactive-streams (org.reactivestreams:reactive-streams:1.0.3 - http://www.reactive-streams.org/) + (MIT-0) reactive-streams (org.reactivestreams:reactive-streams:1.0.4 - http://www.reactive-streams.org/) (MIT) refined (eu.timepit:refined_2.13:0.10.1 - https://github.com/fthomas/refined) (The Apache Software License, Version 2.0) rest (org.elasticsearch.client:elasticsearch-rest-client:7.10.2 - https://github.com/elastic/elasticsearch) (The Apache Software License, Version 2.0) rest-high-level (org.elasticsearch.client:elasticsearch-rest-high-level-client:7.10.2 - https://github.com/elastic/elasticsearch) diff --git a/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml b/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml index b95cb0364..91fb46dec 100644 --- a/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml +++ b/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml @@ -36,7 +36,7 @@ io.dockstore dockstore-integration-testing - 1.16.0-alpha.15 + 1.16.0 tests compile @@ -49,13 +49,13 @@ io.dockstore dockstore-common - 1.16.0-alpha.15 + 1.16.0 compile io.dockstore dockstore-webservice - 1.16.0-alpha.15 + 1.16.0 compile @@ -67,7 +67,7 @@ io.dockstore openapi-java-client - 1.16.0-alpha.15 + 1.16.0 compile diff --git a/dockstore-cli-reports/generated/src/main/resources/pom.xml b/dockstore-cli-reports/generated/src/main/resources/pom.xml index 27a0f9db0..cbccd3356 100644 --- a/dockstore-cli-reports/generated/src/main/resources/pom.xml +++ b/dockstore-cli-reports/generated/src/main/resources/pom.xml @@ -30,13 +30,13 @@ io.dockstore dockstore-webservice - 1.16.0-alpha.15 + 1.16.0 compile io.dockstore dockstore-common - 1.16.0-alpha.15 + 1.16.0 compile diff --git a/dockstore-client/generated/src/main/resources/pom.xml b/dockstore-client/generated/src/main/resources/pom.xml index 17fa9a06f..93d368bbe 100644 --- a/dockstore-client/generated/src/main/resources/pom.xml +++ b/dockstore-client/generated/src/main/resources/pom.xml @@ -66,7 +66,7 @@ io.dockstore dockstore-common - 1.16.0-alpha.15 + 1.16.0 compile @@ -78,7 +78,7 @@ io.dockstore openapi-java-client - 1.16.0-alpha.15 + 1.16.0 compile @@ -108,7 +108,7 @@ com.google.code.gson gson - 2.9.0 + 2.10.1 compile @@ -267,7 +267,7 @@ commons-codec commons-codec - 1.15 + 1.17.1 compile @@ -313,25 +313,25 @@ software.amazon.awssdk regions - 2.17.186 + 2.28.7 compile software.amazon.awssdk sdk-core - 2.17.186 + 2.28.7 compile software.amazon.awssdk auth - 2.17.186 + 2.28.7 compile software.amazon.awssdk profiles - 2.17.186 + 2.28.7 compile diff --git a/pom.xml b/pom.xml index def380a46..bb695961d 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ scm:git:git@github.com:dockstore/dockstore-cli.git UTF-8 - 1.16.0-alpha.15 + 1.16.0 2.22.2 2.22.2 false diff --git a/support/generated/src/main/resources/pom.xml b/support/generated/src/main/resources/pom.xml index b17e91faf..a296dfdec 100644 --- a/support/generated/src/main/resources/pom.xml +++ b/support/generated/src/main/resources/pom.xml @@ -30,43 +30,43 @@ software.amazon.awssdk ec2 - 2.17.186 + 2.28.7 compile software.amazon.awssdk s3 - 2.17.186 + 2.28.7 compile software.amazon.awssdk iam - 2.17.186 + 2.28.7 compile software.amazon.awssdk lambda - 2.17.186 + 2.28.7 compile software.amazon.awssdk regions - 2.17.186 + 2.28.7 compile software.amazon.awssdk cloudformation - 2.17.186 + 2.28.7 compile software.amazon.awssdk rds - 2.17.186 + 2.28.7 compile @@ -78,7 +78,7 @@ software.amazon.awssdk config - 2.17.186 + 2.28.7 compile From c361c377ca2ded53b6fd08d81f4cf0c90b67be2c Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Fri, 22 Nov 2024 16:05:18 -0500 Subject: [PATCH 2/3] iterate things to 1.17 and new avro --- THIRD-PARTY-LICENSES.txt | 10 +++---- .../generated/src/main/resources/pom.xml | 14 +++++----- .../generated/src/main/resources/pom.xml | 10 +++---- .../generated/src/main/resources/pom.xml | 16 +++++------ .../cli/nested/AbstractEntryClient.java | 2 +- .../github/collaboratory/cwl/CWLClient.java | 2 +- .../generated/src/main/resources/pom.xml | 2 +- .../generated/src/main/resources/pom.xml | 2 +- pom.xml | 28 ++----------------- support/generated/src/main/resources/pom.xml | 2 +- 10 files changed, 33 insertions(+), 55 deletions(-) diff --git a/THIRD-PARTY-LICENSES.txt b/THIRD-PARTY-LICENSES.txt index 414a32e15..d7541bd3e 100644 --- a/THIRD-PARTY-LICENSES.txt +++ b/THIRD-PARTY-LICENSES.txt @@ -9,16 +9,16 @@ Lists of 403 third-party dependencies. (Apache License 2.0) Annotations for Metrics (io.dropwizard.metrics:metrics-annotation:4.2.19 - https://metrics.dropwizard.io/metrics-annotation) (The BSD License) ANTLR 4 Runtime (org.antlr:antlr4-runtime:4.10.1 - http://www.antlr.org/antlr4-runtime) (EPL 2.0) (GPL2 w/ CPE) aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:3.0.4 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged) - (Apache-2.0) Apache Avro (org.apache.avro:avro:1.11.3 - https://avro.apache.org) + (Apache-2.0) Apache Avro (org.apache.avro:avro:1.11.4 - https://avro.apache.org) (Apache License, Version 2.0) Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.4 - https://commons.apache.org/proper/commons-beanutils/) (Apache-2.0) Apache Commons Codec (commons-codec:commons-codec:1.17.1 - https://commons.apache.org/proper/commons-codec/) (Apache License, Version 2.0) Apache Commons Collections (commons-collections:commons-collections:3.2.2 - http://commons.apache.org/collections/) (Apache License, Version 2.0) Apache Commons Collections (org.apache.commons:commons-collections4:4.4 - https://commons.apache.org/proper/commons-collections/) - (Apache-2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.26.0 - https://commons.apache.org/proper/commons-compress/) + (Apache-2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.26.2 - https://commons.apache.org/proper/commons-compress/) (Apache-2.0) Apache Commons Configuration (org.apache.commons:commons-configuration2:2.10.1 - https://commons.apache.org/proper/commons-configuration/) (Apache License, Version 2.0) Apache Commons CSV (org.apache.commons:commons-csv:1.5 - http://commons.apache.org/proper/commons-csv/) (Apache License, Version 2.0) Apache Commons Exec (org.apache.commons:commons-exec:1.3 - http://commons.apache.org/proper/commons-exec/) - (Apache-2.0) Apache Commons IO (commons-io:commons-io:2.15.1 - https://commons.apache.org/proper/commons-io/) + (Apache-2.0) Apache Commons IO (commons-io:commons-io:2.16.1 - https://commons.apache.org/proper/commons-io/) (Apache-2.0) Apache Commons Lang (org.apache.commons:commons-lang3:3.14.0 - https://commons.apache.org/proper/commons-lang/) (Apache-2.0) Apache Commons Logging (commons-logging:commons-logging:1.3.0 - https://commons.apache.org/proper/commons-logging/) (Apache License, Version 2.0) Apache Commons Net (commons-net:commons-net:3.9.0 - https://commons.apache.org/proper/commons-net/) @@ -132,8 +132,8 @@ Lists of 403 third-party dependencies. (Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt) cromwell-wdl-transforms-new-base (org.broadinstitute:cromwell-wdl-transforms-new-base_2.13:85 - no url defined) (Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt) cromwell-wdl-transforms-shared (org.broadinstitute:cromwell-wdl-transforms-shared_2.13:85 - no url defined) (Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt) cromwell-wom (org.broadinstitute:cromwell-wom_2.13:85 - no url defined) - (Apache License, Version 2.0) cwlavro-generated (io.cwl:cwlavro-generated:2.0.4.9 - no url defined) - (Apache License, Version 2.0) cwlavro-tools (io.cwl:cwlavro-tools:2.0.4.9 - no url defined) + (Apache License, Version 2.0) cwlavro-generated (io.cwl:cwlavro-generated:2.1.0 - no url defined) + (Apache License, Version 2.0) cwlavro-tools (io.cwl:cwlavro-tools:2.1.0 - no url defined) (The Apache Software License, Version 2.0) docker-java-api (com.github.docker-java:docker-java-api:3.3.6 - https://github.com/docker-java/docker-java) (The Apache Software License, Version 2.0) docker-java-core (com.github.docker-java:docker-java-core:3.3.6 - https://github.com/docker-java/docker-java) (The Apache Software License, Version 2.0) docker-java-transport (com.github.docker-java:docker-java-transport:3.3.6 - https://github.com/docker-java/docker-java) diff --git a/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml b/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml index 91fb46dec..0a7292ee5 100644 --- a/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml +++ b/dockstore-cli-integration-testing/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore dockstore-cli-integration-testing - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT Apache Software License, Version 2.0 @@ -30,13 +30,13 @@ io.dockstore dockstore-client - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT compile io.dockstore dockstore-integration-testing - 1.16.0 + 1.17.0-alpha.0 tests compile @@ -49,13 +49,13 @@ io.dockstore dockstore-common - 1.16.0 + 1.17.0-alpha.0 compile io.dockstore dockstore-webservice - 1.16.0 + 1.17.0-alpha.0 compile @@ -67,7 +67,7 @@ io.dockstore openapi-java-client - 1.16.0 + 1.17.0-alpha.0 compile @@ -79,7 +79,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 compile diff --git a/dockstore-cli-reports/generated/src/main/resources/pom.xml b/dockstore-cli-reports/generated/src/main/resources/pom.xml index cbccd3356..7907e92dd 100644 --- a/dockstore-cli-reports/generated/src/main/resources/pom.xml +++ b/dockstore-cli-reports/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore dockstore-cli-reports - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT Apache Software License, Version 2.0 @@ -30,25 +30,25 @@ io.dockstore dockstore-webservice - 1.16.0 + 1.17.0-alpha.0 compile io.dockstore dockstore-common - 1.16.0 + 1.17.0-alpha.0 compile io.dockstore dockstore-client - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT compile io.dockstore dockstore-cli-integration-testing - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT compile diff --git a/dockstore-client/generated/src/main/resources/pom.xml b/dockstore-client/generated/src/main/resources/pom.xml index 93d368bbe..d43a6fd69 100644 --- a/dockstore-client/generated/src/main/resources/pom.xml +++ b/dockstore-client/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore dockstore-client - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT Apache Software License, Version 2.0 @@ -66,7 +66,7 @@ io.dockstore dockstore-common - 1.16.0 + 1.17.0-alpha.0 compile @@ -78,19 +78,19 @@ io.dockstore openapi-java-client - 1.16.0 + 1.17.0-alpha.0 compile io.dockstore openapi-java-wes-client - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT compile io.dockstore dockstore-file-plugin-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT compile @@ -126,7 +126,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 compile @@ -162,7 +162,7 @@ io.cwl cwlavro-tools - 2.0.4.9 + 2.1.0 compile @@ -178,7 +178,7 @@ io.cwl cwlavro-generated - 2.0.4.9 + 2.1.0 compile diff --git a/dockstore-client/src/main/java/io/dockstore/client/cli/nested/AbstractEntryClient.java b/dockstore-client/src/main/java/io/dockstore/client/cli/nested/AbstractEntryClient.java index b63587c58..649e07960 100644 --- a/dockstore-client/src/main/java/io/dockstore/client/cli/nested/AbstractEntryClient.java +++ b/dockstore-client/src/main/java/io/dockstore/client/cli/nested/AbstractEntryClient.java @@ -221,7 +221,7 @@ boolean getIgnoreChecksums() { public CWL getCwlUtil() { // TODO: may be reactivated if we find a different way to read CWL into Java // String cwlrunner = CWLRunnerFactory.getCWLRunner(); - return new CWL(false, Utilities.parseConfig(getConfigFile())); + return new CWL(Utilities.parseConfig(getConfigFile())); } public abstract String getConfigFile(); diff --git a/dockstore-client/src/main/java/io/github/collaboratory/cwl/CWLClient.java b/dockstore-client/src/main/java/io/github/collaboratory/cwl/CWLClient.java index a71380899..8c5a454b2 100644 --- a/dockstore-client/src/main/java/io/github/collaboratory/cwl/CWLClient.java +++ b/dockstore-client/src/main/java/io/github/collaboratory/cwl/CWLClient.java @@ -177,7 +177,7 @@ public File provisionInputFiles() { Class cwlClassTarget = getCWLClassTarget(); // Load CWL from JSON to object - CWL cwlUtil = new CWL(false, config); + CWL cwlUtil = new CWL(config); // This won't work since I am using zip files, it is expecting files to be unzipped final String imageDescriptorContent = cwlUtil.parseCWL(localPrimaryDescriptorFile.getAbsolutePath()).getLeft(); Object cwlObject = null; diff --git a/dockstore-file-plugin-parent/generated/src/main/resources/pom.xml b/dockstore-file-plugin-parent/generated/src/main/resources/pom.xml index c4e69e77e..1f3f7f0c9 100644 --- a/dockstore-file-plugin-parent/generated/src/main/resources/pom.xml +++ b/dockstore-file-plugin-parent/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore dockstore-file-plugin-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT Apache Software License, Version 2.0 diff --git a/openapi-java-wes-client/generated/src/main/resources/pom.xml b/openapi-java-wes-client/generated/src/main/resources/pom.xml index ada309da9..65505c398 100644 --- a/openapi-java-wes-client/generated/src/main/resources/pom.xml +++ b/openapi-java-wes-client/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore openapi-java-wes-client - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index bb695961d..02423660f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,12 +33,12 @@ --> - 1.16 + 1.17 .0-SNAPSHOT scm:git:git@github.com:dockstore/dockstore-cli.git UTF-8 - 1.16.0 + 1.17.0-alpha.0 2.22.2 2.22.2 false @@ -53,7 +53,7 @@ ${project.basedir}/target/jacoco.xml,${project.basedir}/target/jacoco-it.xml,${project.basedir}/../dockstore-cli-reports/target/site/jacoco-aggregate/jacoco.xml - 2.0.4.9 + 2.1.0 @@ -200,28 +200,6 @@ - - - org.apache.commons - commons-compress - 1.26.0 - - - org.apache.commons - commons-text - 1.11.0 - - - commons-io - commons-io - 2.15.1 - - - org.apache.commons - commons-lang3 - 3.14.0 - - diff --git a/support/generated/src/main/resources/pom.xml b/support/generated/src/main/resources/pom.xml index a296dfdec..9f7589209 100644 --- a/support/generated/src/main/resources/pom.xml +++ b/support/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore support - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT Apache Software License, Version 2.0 From 6e1e74ed5e36fa08d990b643e4380c36bf4038f9 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Fri, 22 Nov 2024 16:19:47 -0500 Subject: [PATCH 3/3] adapt test --- .../test/java/io/dockstore/client/cli/YamlValidatorTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockstore-client/src/test/java/io/dockstore/client/cli/YamlValidatorTest.java b/dockstore-client/src/test/java/io/dockstore/client/cli/YamlValidatorTest.java index 1217ec963..c25d9bb85 100644 --- a/dockstore-client/src/test/java/io/dockstore/client/cli/YamlValidatorTest.java +++ b/dockstore-client/src/test/java/io/dockstore/client/cli/YamlValidatorTest.java @@ -90,7 +90,7 @@ void relativePrimaryPathYml() { YamlVerifyUtility.dockstoreValidate(relativePathDockstoreYmlDirectory); fail("Invalid YAML not caught"); } catch (YamlVerifyUtility.ValidateYamlException ex) { - assertTrue(ex.getMessage().contains("the path must be an absolute path to be valid")); + assertTrue(ex.getMessage().contains("must be an absolute path to be valid")); } } @@ -103,7 +103,7 @@ void relativeTestDescriptorPathYml() { YamlVerifyUtility.dockstoreValidate(relativePathDockstoreYmlDirectory); fail("Invalid YAML not caught"); } catch (YamlVerifyUtility.ValidateYamlException ex) { - assertTrue(ex.getMessage().contains("the path must be an absolute path to be valid")); + assertTrue(ex.getMessage().contains("must be an absolute path to be valid")); } }