>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21172?usp=email )
Change subject: [NO ISSUE][MISC] Update deps to latest patch versions ...................................................................... [NO ISSUE][MISC] Update deps to latest patch versions Change-Id: I64f7192cf7ae2d2ade7a9f5abac006a593cc138d Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21172 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java M asterixdb/asterix-cloud/pom.xml M asterixdb/asterix-dashboard/pom.xml M asterixdb/asterix-external-data/pom.xml M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/iceberg/auth/EnsureCloseClientsRESTSigV4AuthSession.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Constants.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Utils.java M asterixdb/asterix-podman/pom.xml M asterixdb/asterix-server/pom.xml M asterixdb/pom.xml M hyracks-fullstack/hyracks/hyracks-cloud/pom.xml M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml M hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/annotations/AiProvenance.java M hyracks-fullstack/pom.xml 15 files changed, 136 insertions(+), 85 deletions(-) Approvals: Jenkins: Verified; Verified Michael Blow: Looks good to me, but someone else must approve Hussain Towaileb: Looks good to me, approved diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index cb330c3..4cdabe7 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -1163,7 +1163,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.31</version> + <version>2.3.34</version> <scope>test</scope> </dependency> <dependency> diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java index 8393e4b..edd20bf 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java @@ -245,6 +245,10 @@ CONF.set("fs.s3a.change.detection.version.required", "false"); CONF.set(S3Constants.HADOOP_ACCESS_KEY_ID, TestConstants.S3_ACCESS_KEY_ID_DEFAULT); CONF.set(S3Constants.HADOOP_SECRET_ACCESS_KEY, TestConstants.S3_SECRET_ACCESS_KEY_DEFAULT); + // The analytics-accelerator stream factory (default in Hadoop 3.4+) performs a HeadObject during stream + // initialization to retrieve ETag, which the S3 mock does not return; this causes a NullPointerException. + // Use the classic (non-analytics) input stream type to avoid this. + CONF.set(S3Constants.HADOOP_INPUT_STREAM_TYPE, S3Constants.HADOOP_INPUT_STREAM_TYPE_VAL_CLASSIC); } public static void prepareIcebergTableContainer() { @@ -317,7 +321,6 @@ FileFormat.PARQUET.name(), TableProperties.FORMAT_VERSION, "1"), ICEBERG_TABLE_PATH_EMPTY); // multiple data files - Table multipleDataFiles = tables.create(SCHEMA, PartitionSpec.unpartitioned(), ImmutableMap.of(TableProperties.DEFAULT_FILE_FORMAT, FileFormat.PARQUET.name(), TableProperties.FORMAT_VERSION, "1"), @@ -409,7 +412,12 @@ S3ClientBuilder builder = S3Client.builder(); URI endpoint = URI.create(MOCK_SERVER_HOSTNAME); // endpoint pointing to S3 mock server builder.region(Region.of(MOCK_SERVER_REGION)).credentialsProvider(AnonymousCredentialsProvider.create()) - .endpointOverride(endpoint); + .endpointOverride(endpoint) + // AWS SDK 2.43+ sends CRC64NVME checksums by default; the S3 mock does not support them. + .requestChecksumCalculation( + software.amazon.awssdk.core.checksums.RequestChecksumCalculation.WHEN_REQUIRED) + .responseChecksumValidation( + software.amazon.awssdk.core.checksums.ResponseChecksumValidation.WHEN_REQUIRED); client = builder.build(); client.createBucket(CreateBucketRequest.builder().bucket(PLAYGROUND_CONTAINER).build()); client.createBucket(CreateBucketRequest.builder().bucket(DYNAMIC_PREFIX_AT_START_CONTAINER).build()); diff --git a/asterixdb/asterix-cloud/pom.xml b/asterixdb/asterix-cloud/pom.xml index b0e2f5d..40ed94d 100644 --- a/asterixdb/asterix-cloud/pom.xml +++ b/asterixdb/asterix-cloud/pom.xml @@ -218,7 +218,7 @@ <dependency> <groupId>com.azure</groupId> <artifactId>azure-storage-blob-batch</artifactId> - <version>12.23.0</version> + <version>12.23.1</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> diff --git a/asterixdb/asterix-dashboard/pom.xml b/asterixdb/asterix-dashboard/pom.xml index 64031d9..e23b208 100644 --- a/asterixdb/asterix-dashboard/pom.xml +++ b/asterixdb/asterix-dashboard/pom.xml @@ -66,7 +66,7 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>1.11.0</version> + <version>1.11.3</version> <configuration> <nodeVersion>v14.21.3</nodeVersion> <npmVersion>6.14.17</npmVersion> diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml index 000beff..ace8385 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -261,13 +261,13 @@ <dependency> <groupId>org.twitter4j</groupId> <artifactId>twitter4j-core</artifactId> - <version>4.0.3</version> + <version>4.0.3</version> <!-- do not update unless necessary, we cannot build against newer versions--> <scope>provided</scope> </dependency> <dependency> <groupId>org.twitter4j</groupId> <artifactId>twitter4j-stream</artifactId> - <version>4.0.3</version> + <version>4.0.3</version> <!-- do not update unless necessary, we cannot build against newer versions--> <scope>provided</scope> </dependency> <dependency> @@ -286,7 +286,7 @@ <dependency> <groupId>com.couchbase.client</groupId> <artifactId>core-io</artifactId> - <version>1.3.2</version> + <version>1.3.7</version> </dependency> <dependency> <groupId>org.mockito</groupId> @@ -599,12 +599,12 @@ <dependency> <groupId>io.delta</groupId> <artifactId>delta-kernel-api</artifactId> - <version>4.0.0</version> + <version>4.0.1</version> </dependency> <dependency> <groupId>io.delta</groupId> <artifactId>delta-kernel-defaults</artifactId> - <version>4.0.0</version> + <version>4.0.1</version> <exclusions> <exclusion> <groupId>org.apache.hadoop</groupId> diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/iceberg/auth/EnsureCloseClientsRESTSigV4AuthSession.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/iceberg/auth/EnsureCloseClientsRESTSigV4AuthSession.java index 77a49db..91ea87f 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/iceberg/auth/EnsureCloseClientsRESTSigV4AuthSession.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/iceberg/auth/EnsureCloseClientsRESTSigV4AuthSession.java @@ -36,7 +36,6 @@ import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; import software.amazon.awssdk.auth.signer.Aws4Signer; -import software.amazon.awssdk.auth.signer.internal.SignerConstant; import software.amazon.awssdk.auth.signer.params.Aws4SignerParams; import software.amazon.awssdk.auth.signer.params.SignerChecksumParams; import software.amazon.awssdk.core.checksums.Algorithm; @@ -52,6 +51,8 @@ static final String EMPTY_BODY_SHA256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; static final String RELOCATED_HEADER_PREFIX = "Original-"; + // Header name used by SigV4 for content checksum. Avoid depending on internal SDK constants. + static final String X_AMZ_CONTENT_SHA256 = "x-amz-content-sha256"; private final Aws4Signer signer; private final AuthSession delegate; @@ -87,7 +88,7 @@ Aws4SignerParams params = Aws4SignerParams.builder().signingName(signingName).signingRegion(signingRegion) .awsCredentials(credentialsProvider.resolveCredentials()) .checksumParams(SignerChecksumParams.builder().algorithm(Algorithm.SHA256).isStreamingRequest(false) - .checksumHeaderName(SignerConstant.X_AMZ_CONTENT_SHA256).build()) + .checksumHeaderName(X_AMZ_CONTENT_SHA256).build()) .build(); SdkHttpFullRequest.Builder sdkRequestBuilder = SdkHttpFullRequest.builder(); @@ -100,7 +101,7 @@ if (body == null) { // This is a workaround for the signer implementation incorrectly producing // an invalid content checksum for empty body requests. - sdkRequestBuilder.putHeader(SignerConstant.X_AMZ_CONTENT_SHA256, EMPTY_BODY_SHA256); + sdkRequestBuilder.putHeader(X_AMZ_CONTENT_SHA256, EMPTY_BODY_SHA256); } else { sdkRequestBuilder.contentStreamProvider(() -> IOUtils.toInputStream(body, StandardCharsets.UTF_8)); } diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Constants.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Constants.java index 2701c36..2e5d213 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Constants.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Constants.java @@ -48,6 +48,11 @@ public static final String HADOOP_SERVICE_END_POINT = "fs.s3a.endpoint"; public static final String HADOOP_REGION = "fs.s3a.endpoint.region"; + // input stream + public static final String HADOOP_INPUT_STREAM_TYPE = "fs.s3a.input.stream.type"; + public static final String HADOOP_INPUT_STREAM_TYPE_VAL_CLASSIC = "classic"; + public static final String HADOOP_INPUT_STREAM_TYPE_VAL_ANALYTICS = "analytics"; + /* * Internal configurations */ diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Utils.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Utils.java index a2d837e..07424b1 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Utils.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/aws/s3/S3Utils.java @@ -56,6 +56,8 @@ import static org.apache.asterix.external.util.aws.s3.S3Constants.HADOOP_ASSUME_ROLE_SESSION_NAME; import static org.apache.asterix.external.util.aws.s3.S3Constants.HADOOP_CREDENTIALS_TO_ASSUME_ROLE_KEY; import static org.apache.asterix.external.util.aws.s3.S3Constants.HADOOP_CREDENTIAL_PROVIDER_KEY; +import static org.apache.asterix.external.util.aws.s3.S3Constants.HADOOP_INPUT_STREAM_TYPE; +import static org.apache.asterix.external.util.aws.s3.S3Constants.HADOOP_INPUT_STREAM_TYPE_VAL_CLASSIC; import static org.apache.asterix.external.util.aws.s3.S3Constants.HADOOP_INSTANCE_PROFILE; import static org.apache.asterix.external.util.aws.s3.S3Constants.HADOOP_PATH_STYLE_ACCESS; import static org.apache.asterix.external.util.aws.s3.S3Constants.HADOOP_REGION; @@ -104,10 +106,13 @@ import org.apache.hyracks.api.exceptions.IWarningCollector; import org.apache.hyracks.api.exceptions.SourceLocation; import org.apache.hyracks.api.exceptions.Warning; +import org.apache.hyracks.util.annotations.AiProvenance; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; +import software.amazon.awssdk.core.checksums.RequestChecksumCalculation; +import software.amazon.awssdk.core.checksums.ResponseChecksumValidation; import software.amazon.awssdk.core.exception.SdkException; import software.amazon.awssdk.http.SdkHttpClient; import software.amazon.awssdk.http.SdkHttpConfigurationOption; @@ -180,11 +185,27 @@ } else if (certificates != null && !certificates.isBlank()) { builder.httpClient(createHttpClient(certificates)); } + if (serviceEndpoint != null) { + configureS3CompatibleSettings(serviceEndpoint, builder); + } awsClients.setConsumingClient(builder.build()); return awsClients; } + @AiProvenance(agent = AiProvenance.Agent.CLAUDE_SONNET_4_6, tool = AiProvenance.Tool.GITHUB_COPILOT) + private static void configureS3CompatibleSettings(String serviceEndpoint, S3ClientBuilder builder) { + // AWS SDK 2.43+ sends CRC64NVME request checksums by default for all eligible operations. + // S3-compatible endpoints (non-AWS) and older mock servers do not understand this header and + // may reject or mishandle requests, returning empty or error responses. When a custom endpoint + // is configured (i.e. not talking to real AWS S3), disable automatic checksum calculation so + // only operations that explicitly require a checksum will include one. + if (serviceEndpoint != null) { + builder.requestChecksumCalculation(RequestChecksumCalculation.WHEN_REQUIRED); + builder.responseChecksumValidation(ResponseChecksumValidation.WHEN_REQUIRED); + } + } + static SdkHttpClient createHttpClient(String pemCertificates) throws CompilationException { TrustManager[] trustManagers = buildTrustManagers(pemCertificates); TlsTrustManagersProvider trustManagersProvider = new StaticTrustManagersProvider(trustManagers); @@ -264,6 +285,13 @@ if (serviceEndpoint != null) { // Validation of the URL should be done at hadoop-aws level jobConf.set(HADOOP_SERVICE_END_POINT, serviceEndpoint); + + // The analytics-accelerator stream factory (default in Hadoop 3.4+) performs a HeadObject call during + // stream initialization to fetch the ETag. Non-AWS S3-compatible endpoints (e.g. mock servers) may not + // return an ETag on HeadObject, which causes a NullPointerException. Fall back to the classic stream + // implementation when a custom service endpoint is in use. + // TODO: make configurable + jobConf.set(HADOOP_INPUT_STREAM_TYPE, HADOOP_INPUT_STREAM_TYPE_VAL_CLASSIC); } boolean pathStyleAddressing = diff --git a/asterixdb/asterix-podman/pom.xml b/asterixdb/asterix-podman/pom.xml index 6c1e158..0dcd6c8 100644 --- a/asterixdb/asterix-podman/pom.xml +++ b/asterixdb/asterix-podman/pom.xml @@ -55,7 +55,7 @@ <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> - <version>1.17.1</version> + <version>1.17.6</version> <scope>test</scope> </dependency> </dependencies> diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index e5714a7..e738df8 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -139,10 +139,6 @@ <url>https://github.com/codehaus/paranamer-git/blob/paranamer-2.3/LICENSE.txt</url> </override> <override> - <gav>com.github.jnr:jnr-posix:3.1.19</gav> - <url>https://www.eclipse.org/legal/epl-2.0</url> - </override> - <override> <gav>org.codehaus.jettison:jettison:1.1</gav> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> </override> @@ -633,6 +629,20 @@ <contentFile>protobuf_2.5.0_LICENSE.txt</contentFile> </license> <license> + <displayName>GNU General Public License Version 2</displayName> + <url>http://www.gnu.org/copyleft/gpl.html</url> + <metric>99999999</metric> <!-- ASF Category X --> + </license> + <license> + <displayName>GNU Lesser General Public License Version 2.1</displayName> + <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> + <aliasUrls> + <aliasUrl>http://www.gnu.org/licenses/lgpl.html</aliasUrl> + <aliasUrl>https://www.gnu.org/licenses/lgpl-2.1.html</aliasUrl> + </aliasUrls> + <metric>99999999</metric> <!-- ASF Category X --> + </license> + <license> <displayName>Eclipse Distribution License - v 1.0</displayName> <url>https://www.eclipse.org/org/documents/edl-v10.php</url> <aliasUrls> @@ -642,8 +652,9 @@ </license> <license> <displayName>Eclipse Public License, Version 2.0</displayName> - <url>https://www.eclipse.org/legal/epl-2.0/</url> + <url>https://www.eclipse.org/legal/epl-2.0</url> <aliasUrls> + <aliasUrl>https://www.eclipse.org/legal/epl-2.0/</aliasUrl> <aliasUrl>https://github.com/locationtech/jts/blob/master/LICENSE_EPLv2.txt</aliasUrl> </aliasUrls> <metric>1100</metric> @@ -1341,7 +1352,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.1.0</version> + <version>3.1.1</version> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index cffa215..d505d34 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -91,38 +91,35 @@ <!-- Versions under dependencymanagement or used in many projects via properties --> <algebricks.version>0.3.10-SNAPSHOT</algebricks.version> <hyracks.version>0.3.10-SNAPSHOT</hyracks.version> - <hadoop.version>3.4.2</hadoop.version> + <hadoop.version>3.4.3</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> - <log4j.version>2.25.3</log4j.version> + <log4j.version>2.25.4</log4j.version> <avro.version>1.12.1</avro.version> - <!-- IMPORTANT: please keep the aws-crt version in sync with that defined in the AWS SDK BOM --> - <!-- you can get this by inspecting the aws-sdk-java-pom for the SDK version. e.g. - $ curl -s https://repo1.maven.org/maven2/software/amazon/awssdk/aws-sdk-java-pom/2.31.57/aws-sdk-java-pom-2.31.57.pom | grep awscrt.version - <awscrt.version>0.38.1</awscrt.version> - --> - <awsjavasdk.version>2.29.27</awsjavasdk.version> <parquet.version>1.17.0</parquet.version> <!-- NOTICE: please update transitives from parquet below on any change --> <hadoop-awsjavasdk.version>1.12.797</hadoop-awsjavasdk.version> - <awsjavasdk.crt.version>0.33.3</awsjavasdk.crt.version> - <azureblobjavasdk.version>12.31.1</azureblobjavasdk.version> - <azurecommonjavasdk.version>12.30.1</azurecommonjavasdk.version> + <awsjavasdk.version>2.43.1</awsjavasdk.version> + <!-- @derived-from: software.amazon.awssdk:aws-sdk-java-pom:${awsjavasdk.version}#awscrt.version --> + <awsjavasdk.crt.version>0.45.1</awsjavasdk.crt.version> + + <azureblobjavasdk.version>12.31.3</azureblobjavasdk.version> + <azurecommonjavasdk.version>12.30.3</azurecommonjavasdk.version> <azureidentity.version>1.17.0</azureidentity.version> - <azuredatalakejavasdk.version>12.24.1</azuredatalakejavasdk.version> + <azuredatalakejavasdk.version>12.24.3</azuredatalakejavasdk.version> <azurecore.version>1.57.1</azurecore.version> - <azurecorehttpnetty.version>1.16.3</azurecorehttpnetty.version> + <azurecorehttpnetty.version>1.16.4</azurecorehttpnetty.version> <!-- keep in sync with hyracks-fullstack/pom.xml --> <google-cloud-storage.version>2.67.0</google-cloud-storage.version> <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version> <hadoop-gcs.version>hadoop3-2.2.25</hadoop-gcs.version> <io.opencensus.version>0.31.1</io.opencensus.version> - <protobuf-java.version>3.25.8</protobuf-java.version> + <protobuf-java.version>3.25.9</protobuf-java.version> - <icebergjavasdk.version>1.10.0</icebergjavasdk.version> + <icebergjavasdk.version>1.10.1</icebergjavasdk.version> <!-- match with Nessie version used in Iceberg --> - <nessieproject.version>0.104.5</nessieproject.version> + <nessieproject.version>0.104.10</nessieproject.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> @@ -379,7 +376,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>3.8.1</version> </plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> @@ -525,7 +522,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>3.1.0</version> + <version>3.1.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -555,7 +552,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.6.0</version> + <version>3.6.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -587,7 +584,7 @@ <plugin> <groupId>pl.project13.maven</groupId> <artifactId>git-commit-id-plugin</artifactId> - <version>2.2.3</version> + <version>2.2.6</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -1026,12 +1023,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.8.4</version> + <version>3.8.9</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.8.4</version> + <version>3.8.9</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -1283,7 +1280,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.27.1</version> + <version>1.28.0</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -1508,7 +1505,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.13</version> + <version>3.4.14</version> <exclusions> <exclusion> <groupId>com.sun.jmx</groupId> @@ -1522,6 +1519,10 @@ <groupId>javax.jms</groupId> <artifactId>jms</artifactId> </exclusion> + <exclusion> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-annotations</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1543,12 +1544,12 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.17.1</version> + <version>1.17.2</version> </dependency> <dependency> <groupId>it.unimi.dsi</groupId> <artifactId>fastutil</artifactId> - <version>8.5.6</version> + <version>8.5.18</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> @@ -1558,7 +1559,7 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>2.3.2</version> + <version>2.3.9</version> </dependency> <dependency> <groupId>javax.activation</groupId> @@ -1573,12 +1574,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.8.4</version> + <version>3.8.9</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> - <version>3.8.4</version> + <version>3.8.9</version> </dependency> <dependency> <groupId>org.locationtech.jts</groupId> @@ -1601,13 +1602,13 @@ <dependency> <groupId>io.findify</groupId> <artifactId>s3mock_2.12</artifactId> - <version>0.2.5</version> + <version>0.2.6</version> </dependency> <!-- Needed for the s3 mock --> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-http-core_2.12</artifactId> - <version>10.1.0</version> + <version>10.1.15</version> </dependency> <!-- Azure Blob Storage start --> <dependency> @@ -1706,22 +1707,22 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-csv</artifactId> - <version>1.12.0</version> + <version>1.14.1</version> </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>postgresql</artifactId> - <version>1.16.2</version> + <version>1.16.3</version> </dependency> <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>42.2.24</version> + <version>42.2.29</version> </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>azure</artifactId> - <version>1.21.3</version> + <version>1.21.4</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -1782,23 +1783,25 @@ </exclusion> </exclusions> </dependency> - <!-- BEGIN: transitive from parquet, please validate with any update of ${parquet.version} --> + <!-- transitive from parquet; please review on any update of ${parquet.version} --> + <!-- @pinned-with: ${parquet.version} --> <dependency> <groupId>io.airlift</groupId> <artifactId>aircompressor</artifactId> <version>2.0.3</version> </dependency> + <!-- @pinned-with: ${parquet.version} --> <dependency> <groupId>com.github.luben</groupId> <artifactId>zstd-jni</artifactId> <version>1.5.7-7</version> </dependency> + <!-- @pinned-with: ${parquet.version} --> <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> <version>1.6</version> </dependency> - <!-- END: transitive from parquet, please validate with any update of ${parquet.version} --> <dependency> <groupId>org.kitesdk</groupId> <artifactId>kite-data-core</artifactId> @@ -1991,11 +1994,6 @@ <artifactId>protobuf-java-util</artifactId> <version>${protobuf-java.version}</version> </dependency> - <!-- IMPORTANT: please keep the aws-crt version in sync with that defined in the AWS SDK BOM --> - <!-- you can get this by inspecting the aws-sdk-java-pom for the SDK version: - $ curl -s https://repo1.maven.org/maven2/software/amazon/awssdk/aws-sdk-java-pom/2.31.57/aws-sdk-java-pom-2.31.57.pom | grep awscrt.version - <awscrt.version>0.38.1</awscrt.version> - --> <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>bom</artifactId> diff --git a/hyracks-fullstack/hyracks/hyracks-cloud/pom.xml b/hyracks-fullstack/hyracks/hyracks-cloud/pom.xml index e385e48..0ce5199 100644 --- a/hyracks-fullstack/hyracks/hyracks-cloud/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-cloud/pom.xml @@ -35,8 +35,8 @@ </licenses> <properties> <root.dir>${basedir}/../..</root.dir> - <jnr-posix.version>3.1.19</jnr-posix.version> - <jnr-ffi.version>2.2.16</jnr-ffi.version> + <jnr-posix.version>3.1.22</jnr-posix.version> + <jnr-ffi.version>2.2.19</jnr-ffi.version> </properties> <dependencies> <dependency> diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml index f119067..40b34b2 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.31</version> + <version>2.3.34</version> </dependency> <dependency> <groupId>commons-io</groupId> @@ -78,7 +78,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.1.0</version> + <version>3.1.1</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/annotations/AiProvenance.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/annotations/AiProvenance.java index bee45b8..b40e3f6 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/annotations/AiProvenance.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/annotations/AiProvenance.java @@ -66,7 +66,7 @@ Tool tool(); - ContributionKind contributionKind(); + ContributionKind contributionKind() default GENERATED; String notes() default ""; diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index f3852bc..f88e5e5 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -69,15 +69,15 @@ <test.includes>${global.test.includes}</test.includes> <test.excludes>${global.test.excludes}</test.excludes> <!-- Versions under dependencymanagement or used in many projects via properties --> - <hadoop.version>3.4.2</hadoop.version> + <hadoop.version>3.4.3</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> - <log4j.version>2.25.3</log4j.version> + <log4j.version>2.25.4</log4j.version> <snappy.version>1.1.10.8</snappy.version> - <jackson.version>2.19.2</jackson.version> + <jackson.version>2.19.4</jackson.version> <jackson-databind.version>${jackson.version}</jackson-databind.version> <netty.version>4.1.132.Final</netty.version> <asm.version>9.3</asm.version> - <awsjavasdk.version>2.29.27</awsjavasdk.version> + <awsjavasdk.version>2.43.1</awsjavasdk.version> <!-- keep in sync with asterixdb/pom.xml --> <google-cloud-storage.version>2.67.0</google-cloud-storage.version> @@ -336,7 +336,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.12.0</version> + <version>1.15.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -408,7 +408,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.18.0</version> + <version>3.20.0</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -460,7 +460,7 @@ <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> + <version>2.3.1</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -470,27 +470,27 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.8.4</version> + <version>3.8.9</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>3.8.4</version> + <version>3.8.9</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> - <version>3.8.4</version> + <version>3.8.9</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.8.4</version> + <version>3.8.9</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>3.8.4</version> + <version>3.8.9</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -505,7 +505,7 @@ <dependency> <groupId>it.unimi.dsi</groupId> <artifactId>fastutil</artifactId> - <version>8.5.6</version> + <version>8.5.18</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -576,12 +576,12 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client-runtime</artifactId> - <version>3.4.1</version> + <version>3.4.3</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client-api</artifactId> - <version>3.4.1</version> + <version>3.4.3</version> </dependency> </dependencies> </dependencyManagement> @@ -834,7 +834,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>3.8.1</version> </plugin> <plugin> <groupId>org.apache.rat</groupId> @@ -979,7 +979,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>3.1.0</version> + <version>3.1.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -1004,7 +1004,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.6.0</version> + <version>3.6.1</version> </plugin> <plugin> <groupId>org.apache.maven.doxia</groupId> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21172?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: lumina Gerrit-Change-Id: I64f7192cf7ae2d2ade7a9f5abac006a593cc138d Gerrit-Change-Number: 21172 Gerrit-PatchSet: 11 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]>
