diff --git a/Makefile b/Makefile index edc56e0..af2c107 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PACKAGE_NAME = marklogic-mlcmd -VERSION = 12.0.1 +VERSION = 12.0.2 RELEASE = 1 BUILD_DIR = $(shell pwd)/build RPMBUILD_DIR = $(BUILD_DIR)/rpmbuild diff --git a/NOTICE.TXT b/NOTICE.TXT index e1d946b..db49990 100644 --- a/NOTICE.TXT +++ b/NOTICE.TXT @@ -1,10 +1,10 @@ MarkLogic® Managed Cluster for AWS 12.0 -Copyright © 2013-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +Copyright © 2013-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. To the extent required by the applicable open-source license, a complete machine-readable copy of the source code corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and shall expire three years following the date of the final distribution of this product version by MarkLogic Corporation. To obtain such source code, send an email to Legal-thirdpartyreview@progress.com. Please specify the product and version for which you are requesting source code. -The following software may be included in MarkLogic® Managed Cluster for AWS 12.0 (last updated July 14, 2025): +The following software may be included in MarkLogic® Managed Cluster for AWS 12.0 (last updated April 28, 2026): Third Party Components @@ -31,19 +31,19 @@ commons-lang 2.6 (Apache-2.0) commons-logging 1.2 (Apache-2.0) idna 3.7 (BSD) ion-java 1.10.5 (Apache-2.0) -jackson-annotations 2.19.0 (Apache-2.0) -jackson-core 2.19.0 (Apache-2.0) -jackson-databind 2.19.0 (Apache-2.0) -jackson-dataformat-cbor 2.19.0 (Apache-2.0) +jackson-annotations 2.21 (Apache-2.0) +jackson-core 2.21.2 (Apache-2.0) +jackson-databind 2.21.2 (Apache-2.0) +jackson-dataformat-cbor 2.21.2 (Apache-2.0) jmespath-java 1.12.530 (Apache-2.0) joda-time 2.8.1 (Apache-2.0) httpclient 4.5.13 (Apache-2.0) httpcore 4.4.13 (Apache-2.0) json-path 0.9.0 (Apache-2.0) json-smart 1.2 (Apache-2.0) -log4j-1.2-api 2.17.1 (Apache-2.0) -log4j-api 2.17.1 (Apache-2.0) -log4j-core 2.17.1 (Apache-2.0) +log4j-1.2-api 2.25.4 (Apache-2.0) +log4j-api 2.25.4 (Apache-2.0) +log4j-core 2.25.4 (Apache-2.0) requests 2.32.4 (Apache-2.0) sax 1.4.1 (ISC) setuptools 80.9.0 (MIT) @@ -199,22 +199,22 @@ https://repo1.maven.org/maven2/software/amazon/ion/ion-java For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -jackson-annotations 2.19.0 (Apache-2.0) +jackson-annotations 2.21 (Apache-2.0) https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -jackson-core 2.19.0 (Apache-2.0) +jackson-core 2.21.2 (Apache-2.0) https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -jackson-databind 2.19.0 (Apache-2.0) +jackson-databind 2.21.2 (Apache-2.0) https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -jackson-dataformat-cbor 2.19.0 (Apache-2.0) +jackson-dataformat-cbor 2.21.2 (Apache-2.0) https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) @@ -249,17 +249,17 @@ https://repo1.maven.org/maven2/net/minidev/json-smart For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -log4j-1.2-api 2.17.1 (Apache-2.0) +log4j-1.2-api 2.25.4 (Apache-2.0) https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-1.2-api For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -log4j-api 2.17.1 (Apache-2.0) +log4j-api 2.25.4 (Apache-2.0) https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -log4j-core 2.17.1 (Apache-2.0) +log4j-core 2.25.4 (Apache-2.0) https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) @@ -1106,4 +1106,4 @@ You may add additional accurate notices of copyright ownership. Exhibit B - “Incompatible With Secondary Licenses” Notice This Source Code Form is “Incompatible With Secondary Licenses”, as defined by the Mozilla Public License, v. 2.0. -================= \ No newline at end of file +================= diff --git a/marklogic-mlcmd.spec b/marklogic-mlcmd.spec index 30259c8..4454419 100644 --- a/marklogic-mlcmd.spec +++ b/marklogic-mlcmd.spec @@ -1,5 +1,5 @@ Name: marklogic-mlcmd -Version: 12.0.1 +Version: 12.0.2 Release: 1 Summary: MarkLogic AWS Command Line Tool License: Apache-2.0 diff --git a/mlcluster-vpc.template b/mlcluster-vpc.template index cc6ba5d..5674e05 100644 --- a/mlcluster-vpc.template +++ b/mlcluster-vpc.template @@ -1,8 +1,8 @@ AWSTemplateFormatVersion: 2010-09-09 Description: Deploy a MarkLogic Cluster on AWS with a new VPC Metadata: - version: 12.0.1 - binary: MarkLogic-12.0.1-rhel.x86_64.rpm + version: 12.0.2 + binary: MarkLogic-12.0.2-rhel.x86_64.rpm AWS::CloudFormation::Interface: ParameterGroups: - Label: @@ -847,53 +847,53 @@ Mappings: TemplateUrl: base: 'https://s3.amazonaws.com/marklogic-db-template-releases' S3Directory: - base: '12.0.1' + base: '12.0.2' LicenseRegion2AMI: us-east-1: - PAYGAl2023: ami-0198b8931e9597271 - BYOLAl2023: ami-0a8536507241f95b0 + PAYGAl2023: ami-05246611c90899836 + BYOLAl2023: ami-0352a2f974ed56def us-east-2: - PAYGAl2023: ami-0877b64dae8264415 - BYOLAl2023: ami-082cc98b2c01e486a + PAYGAl2023: ami-08e24093a72d0b00c + BYOLAl2023: ami-0d0db2790ae7321be us-west-1: - PAYGAl2023: ami-07890fc78f4ddfa20 - BYOLAl2023: ami-05c9a962410c2821b + PAYGAl2023: ami-0322210a14ff8ebf0 + BYOLAl2023: ami-0bfe50ee52d9d158f us-west-2: - PAYGAl2023: ami-0577eb149c9e0f53f - BYOLAl2023: ami-0262dd8d014bf71ba + PAYGAl2023: ami-09beeb6c33214e312 + BYOLAl2023: ami-082b8dbcdf74984f2 eu-central-1: - PAYGAl2023: ami-06348556399c8ab69 - BYOLAl2023: ami-00cb5a3527e7c0d11 + PAYGAl2023: ami-03cf04aef431d2cbd + BYOLAl2023: ami-0a5dee9e461c5b833 eu-west-1: - PAYGAl2023: ami-0fa7bc44cd9ab1f85 - BYOLAl2023: ami-0bc2b4d46367806b0 + PAYGAl2023: ami-063a16632dbe2806b + BYOLAl2023: ami-0049454737121f8f6 ap-south-1: - PAYGAl2023: ami-0f481ba0a6819ced6 - BYOLAl2023: ami-00b59374107e5efb6 + PAYGAl2023: ami-0302ff52afd640ef8 + BYOLAl2023: ami-0db20bba531577708 ap-southeast-1: - PAYGAl2023: ami-0c373c6c8a2316c80 - BYOLAl2023: ami-0b9bd265ef165a07b + PAYGAl2023: ami-033069b2fc0da3805 + BYOLAl2023: ami-0f68bc951db40ddb1 ap-southeast-2: - PAYGAl2023: ami-0c65a907408226a3e - BYOLAl2023: ami-02bad1ef2c6d4a91a + PAYGAl2023: ami-03247af11fe7f43c6 + BYOLAl2023: ami-06cdfc6663c5f948f ap-northeast-1: - PAYGAl2023: ami-0254bc4adaf13e3b9 - BYOLAl2023: ami-07e8b312b1016bf67 + PAYGAl2023: ami-02ce3bb7b810eda16 + BYOLAl2023: ami-05341020c04eb3649 ap-northeast-2: - PAYGAl2023: ami-05995b5f5807873d7 - BYOLAl2023: ami-0afd77ba0d7a0c129 + PAYGAl2023: ami-009dc9e107ac66c98 + BYOLAl2023: ami-092f8030064b02722 sa-east-1: - PAYGAl2023: ami-05ec8fee12de236a5 - BYOLAl2023: ami-09d883ea308449555 + PAYGAl2023: ami-0f6ae88eca5226338 + BYOLAl2023: ami-0bf675495f7c268b1 eu-west-2: - PAYGAl2023: ami-0f5cff9d243f31521 - BYOLAl2023: ami-0588d104a52fbc326 + PAYGAl2023: ami-07693f14925cb0bec + BYOLAl2023: ami-011964b271944002f ca-central-1: - PAYGAl2023: ami-0f34d118b23b51bf5 - BYOLAl2023: ami-0c78eccd03e957005 + PAYGAl2023: ami-0417b9c79013cdd31 + BYOLAl2023: ami-007ea4cc6cbf5ef63 eu-west-3: - PAYGAl2023: ami-01fa9155eb17992c5 - BYOLAl2023: ami-0637199acc5327534 + PAYGAl2023: ami-048b4b70eb154e19f + BYOLAl2023: ami-0d61f8d71ae7568fc Resources: VpcStack: Type: AWS::CloudFormation::Stack diff --git a/mlcluster.template b/mlcluster.template index 198ad14..606592f 100644 --- a/mlcluster.template +++ b/mlcluster.template @@ -1,8 +1,8 @@ AWSTemplateFormatVersion: 2010-09-09 Description: Deploy a MarkLogic Cluster on AWS in existing VPC (Virtual Private Cloud). Metadata: - version: 12.0.1 - binary: MarkLogic-12.0.1-rhel.x86_64.rpm + version: 12.0.2 + binary: MarkLogic-12.0.2-rhel.x86_64.rpm AWS::CloudFormation::Interface: ParameterGroups: - Label: @@ -821,53 +821,53 @@ Mappings: TemplateUrl: base: 'https://s3.amazonaws.com/marklogic-db-template-releases' S3Directory: - base: '12.0.1' + base: '12.0.2' LicenseRegion2AMI: us-east-1: - PAYGAl2023: ami-0198b8931e9597271 - BYOLAl2023: ami-0a8536507241f95b0 + PAYGAl2023: ami-05246611c90899836 + BYOLAl2023: ami-0352a2f974ed56def us-east-2: - PAYGAl2023: ami-0877b64dae8264415 - BYOLAl2023: ami-082cc98b2c01e486a + PAYGAl2023: ami-08e24093a72d0b00c + BYOLAl2023: ami-0d0db2790ae7321be us-west-1: - PAYGAl2023: ami-07890fc78f4ddfa20 - BYOLAl2023: ami-05c9a962410c2821b + PAYGAl2023: ami-0322210a14ff8ebf0 + BYOLAl2023: ami-0bfe50ee52d9d158f us-west-2: - PAYGAl2023: ami-0577eb149c9e0f53f - BYOLAl2023: ami-0262dd8d014bf71ba + PAYGAl2023: ami-09beeb6c33214e312 + BYOLAl2023: ami-082b8dbcdf74984f2 eu-central-1: - PAYGAl2023: ami-06348556399c8ab69 - BYOLAl2023: ami-00cb5a3527e7c0d11 + PAYGAl2023: ami-03cf04aef431d2cbd + BYOLAl2023: ami-0a5dee9e461c5b833 eu-west-1: - PAYGAl2023: ami-0fa7bc44cd9ab1f85 - BYOLAl2023: ami-0bc2b4d46367806b0 + PAYGAl2023: ami-063a16632dbe2806b + BYOLAl2023: ami-0049454737121f8f6 ap-south-1: - PAYGAl2023: ami-0f481ba0a6819ced6 - BYOLAl2023: ami-00b59374107e5efb6 + PAYGAl2023: ami-0302ff52afd640ef8 + BYOLAl2023: ami-0db20bba531577708 ap-southeast-1: - PAYGAl2023: ami-0c373c6c8a2316c80 - BYOLAl2023: ami-0b9bd265ef165a07b + PAYGAl2023: ami-033069b2fc0da3805 + BYOLAl2023: ami-0f68bc951db40ddb1 ap-southeast-2: - PAYGAl2023: ami-0c65a907408226a3e - BYOLAl2023: ami-02bad1ef2c6d4a91a + PAYGAl2023: ami-03247af11fe7f43c6 + BYOLAl2023: ami-06cdfc6663c5f948f ap-northeast-1: - PAYGAl2023: ami-0254bc4adaf13e3b9 - BYOLAl2023: ami-07e8b312b1016bf67 + PAYGAl2023: ami-02ce3bb7b810eda16 + BYOLAl2023: ami-05341020c04eb3649 ap-northeast-2: - PAYGAl2023: ami-05995b5f5807873d7 - BYOLAl2023: ami-0afd77ba0d7a0c129 + PAYGAl2023: ami-009dc9e107ac66c98 + BYOLAl2023: ami-092f8030064b02722 sa-east-1: - PAYGAl2023: ami-05ec8fee12de236a5 - BYOLAl2023: ami-09d883ea308449555 + PAYGAl2023: ami-0f6ae88eca5226338 + BYOLAl2023: ami-0bf675495f7c268b1 eu-west-2: - PAYGAl2023: ami-0f5cff9d243f31521 - BYOLAl2023: ami-0588d104a52fbc326 + PAYGAl2023: ami-07693f14925cb0bec + BYOLAl2023: ami-011964b271944002f ca-central-1: - PAYGAl2023: ami-0f34d118b23b51bf5 - BYOLAl2023: ami-0c78eccd03e957005 + PAYGAl2023: ami-0417b9c79013cdd31 + BYOLAl2023: ami-007ea4cc6cbf5ef63 eu-west-3: - PAYGAl2023: ami-01fa9155eb17992c5 - BYOLAl2023: ami-0637199acc5327534 + PAYGAl2023: ami-048b4b70eb154e19f + BYOLAl2023: ami-0d61f8d71ae7568fc Resources: ManagedEniStack: Type: AWS::CloudFormation::Stack diff --git a/mlcmd/ext/aws/jackson-annotations-2.19.0.jar b/mlcmd/ext/aws/jackson-annotations-2.19.0.jar deleted file mode 100644 index 6b88475..0000000 Binary files a/mlcmd/ext/aws/jackson-annotations-2.19.0.jar and /dev/null differ diff --git a/mlcmd/ext/aws/jackson-annotations-2.21.jar b/mlcmd/ext/aws/jackson-annotations-2.21.jar new file mode 100644 index 0000000..8bcca18 Binary files /dev/null and b/mlcmd/ext/aws/jackson-annotations-2.21.jar differ diff --git a/mlcmd/ext/aws/jackson-core-2.19.0.jar b/mlcmd/ext/aws/jackson-core-2.19.0.jar deleted file mode 100644 index 9e9dd14..0000000 Binary files a/mlcmd/ext/aws/jackson-core-2.19.0.jar and /dev/null differ diff --git a/mlcmd/ext/aws/jackson-core-2.21.2.jar b/mlcmd/ext/aws/jackson-core-2.21.2.jar new file mode 100644 index 0000000..9bf2e03 Binary files /dev/null and b/mlcmd/ext/aws/jackson-core-2.21.2.jar differ diff --git a/mlcmd/ext/aws/jackson-databind-2.19.0.jar b/mlcmd/ext/aws/jackson-databind-2.21.2.jar similarity index 54% rename from mlcmd/ext/aws/jackson-databind-2.19.0.jar rename to mlcmd/ext/aws/jackson-databind-2.21.2.jar index 6dd6f97..99842cb 100644 Binary files a/mlcmd/ext/aws/jackson-databind-2.19.0.jar and b/mlcmd/ext/aws/jackson-databind-2.21.2.jar differ diff --git a/mlcmd/ext/aws/jackson-dataformat-cbor-2.19.0.jar b/mlcmd/ext/aws/jackson-dataformat-cbor-2.19.0.jar deleted file mode 100644 index c8ad7d0..0000000 Binary files a/mlcmd/ext/aws/jackson-dataformat-cbor-2.19.0.jar and /dev/null differ diff --git a/mlcmd/ext/aws/jackson-dataformat-cbor-2.21.2.jar b/mlcmd/ext/aws/jackson-dataformat-cbor-2.21.2.jar new file mode 100644 index 0000000..f84ee2b Binary files /dev/null and b/mlcmd/ext/aws/jackson-dataformat-cbor-2.21.2.jar differ diff --git a/mlcmd/lib/log4j-1.2-api-2.17.1.jar b/mlcmd/lib/log4j-1.2-api-2.17.1.jar deleted file mode 100644 index ef4f08d..0000000 Binary files a/mlcmd/lib/log4j-1.2-api-2.17.1.jar and /dev/null differ diff --git a/mlcmd/lib/log4j-1.2-api-2.25.4.jar b/mlcmd/lib/log4j-1.2-api-2.25.4.jar new file mode 100644 index 0000000..7129485 Binary files /dev/null and b/mlcmd/lib/log4j-1.2-api-2.25.4.jar differ diff --git a/mlcmd/lib/log4j-api-2.17.1.jar b/mlcmd/lib/log4j-api-2.17.1.jar deleted file mode 100644 index 1aae243..0000000 Binary files a/mlcmd/lib/log4j-api-2.17.1.jar and /dev/null differ diff --git a/mlcmd/lib/log4j-api-2.25.4.jar b/mlcmd/lib/log4j-api-2.25.4.jar new file mode 100644 index 0000000..f59bec0 Binary files /dev/null and b/mlcmd/lib/log4j-api-2.25.4.jar differ diff --git a/mlcmd/lib/log4j-core-2.17.1.jar b/mlcmd/lib/log4j-core-2.17.1.jar deleted file mode 100644 index 4682527..0000000 Binary files a/mlcmd/lib/log4j-core-2.17.1.jar and /dev/null differ diff --git a/mlcmd/lib/log4j-core-2.25.4.jar b/mlcmd/lib/log4j-core-2.25.4.jar new file mode 100644 index 0000000..2ea4cee Binary files /dev/null and b/mlcmd/lib/log4j-core-2.25.4.jar differ diff --git a/templates/ml-managedeni.template b/templates/ml-managedeni.template index ec29886..6efd482 100644 --- a/templates/ml-managedeni.template +++ b/templates/ml-managedeni.template @@ -1,7 +1,7 @@ AWSTemplateFormatVersion: 2010-09-09 Description: Launch Managed ENI for MarkLogic Cluster on AWS Metadata: - version: 12.0.1 + version: 12.0.2 AWS::CloudFormation::Interface: ParameterGroups: - Label: diff --git a/templates/ml-nodemanager.template b/templates/ml-nodemanager.template index 8caca07..1c27535 100644 --- a/templates/ml-nodemanager.template +++ b/templates/ml-nodemanager.template @@ -1,7 +1,7 @@ AWSTemplateFormatVersion: 2010-09-09 Description: Launch Lambda function for MarkLogic Node Manager on AWS Metadata: - version: 12.0.1 + version: 12.0.2 AWS::CloudFormation::Interface: ParameterGroups: - Label: diff --git a/templates/ml-vpc.template b/templates/ml-vpc.template index 07356f4..67af963 100644 --- a/templates/ml-vpc.template +++ b/templates/ml-vpc.template @@ -1,7 +1,7 @@ AWSTemplateFormatVersion: 2010-09-09 Description: Create a VPC for MarkLogic cluster Metadata: - version: 12.0.1 + version: 12.0.2 AWS::CloudFormation::Interface: ParameterGroups: - Label: