diff --git a/NOTICE b/NOTICE
index 4ac296384fb64285a1d10076e56ac30fbd6fe922..171352d3694aef98be1315ec8b9183abc34d63d1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -55,267 +55,19 @@ The following software have components provided under the terms of this license:
- AMQP 1.0 JMS Spring Boot Starter (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-starter)
- API Common (from https://github.com/googleapis, https://github.com/googleapis/api-common-java, https://repo1.maven.org/maven2/com/google/api/api-common)
- ASM based accessors helper used by json-smart (from https://urielch.github.io/)
-- AWS Java SDK for AWS Amplify (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS App Mesh (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS AppSync (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Application Auto Scaling (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Application Discovery Service (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Audit Manager (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Auto Scaling Plans (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Backup (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Batch (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Budgets (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Certificate Manager (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Certificate Manager Private Certificate Authority (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Cloud9 (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS CloudFormation (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS CloudHSM V2 (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS CloudTrail (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Code Build (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS CodeCommit (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS CodeDeploy (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS CodePipeline (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS CodeStar (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS CodeStar Notifications (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS CodeStar connections (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Comprehend Medical (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Compute Optimizer (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Config (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Cost Explorer (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Cost and Usage Report (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Data Exchange (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Data Pipeline (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS DataSync (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Database Migration Service (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Device Farm (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Direct Connect (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Directory Service (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS EC2 Instance Connect (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Elastic Beanstalk (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Elemental MediaConvert (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Elemental MediaLive (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Elemental MediaPackage (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Elemental MediaPackage VOD (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Elemental MediaStore (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Elemental MediaStore Data Plane (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Fault Injection Simulator (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS GameLift (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Global Accelerator (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Glue (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Glue DataBrew (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Greengrass (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Ground Station (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Health APIs and Notifications (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IAM (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Import/Export (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT 1-Click Devices (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT 1-Click Projects (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT Analytics (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT Core Device Advisor (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT Events (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT Events Data (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT Fleet Hub (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT Greengrass V2 (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT Jobs Data Plane (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT Secure Tunneling (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT SiteWise (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT Things Graph (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS IoT Wireless (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS KMS (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Lake Formation (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Lambda (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Lex (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS License Manager (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Marketplace Catalog (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Marketplace Commerce Analytics (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Marketplace Entitlement (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Marketplace Metering Service (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS MediaConnect (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS MediaTailor (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Migration Hub (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Migration Hub Config (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Mobile (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Network Firewall (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Network Manager (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS OpsWorks (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS OpsWorks for Chef Automate (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Organizations (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Outposts (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Performance Insights (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Pricing (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS RDS Data (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Resource Access Manager (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Resource Groups (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Resource Groups Tagging API (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS RoboMaker (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS S3 Control (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS SSO Identity Store (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS SSO OIDC (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS STS (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Savings Plans (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Secrets Manager (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS SecurityHub (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Server Migration (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Service Catalog (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Service Catalog App Registry (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Shield (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Signer (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Single Sign-On (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Single Sign-On Admin (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Step Functions (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Storage Gateway (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Support (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Systems Manager Incident Manager (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Systems Manager Incident Manager Contacts (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Transfer for SFTP (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS WAF (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS WAFV2 (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS Well-Architected Tool (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWS X-Ray (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWSKendraFrontend (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AWSServerlessApplicationRepository (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Access Analyzer (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Alexa For Business (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon API Gateway (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon AppConfig (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon AppIntegrations (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon AppStream (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Appflow (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Athena (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Augmented AI Runtime (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Chime (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon CloudDirectory (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon CloudFront (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon CloudSearch (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon CloudWatch (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon CloudWatch Application Insights (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon CloudWatch Events (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon CloudWatch Logs (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon CodeGuru Profiler (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon CodeGuru Reviewer (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Cognito Identity (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Cognito Identity Provider Service (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Cognito Sync (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Comprehend (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Connect (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Connect Contact Lens (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Connect Customer Profiles (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Connect Participant (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Data Lifecycle Manager (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Detective (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon DevOps Guru (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon DocumentDB with MongoDB compatibility (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon DynamoDB (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon DynamoDB Accelerator (DAX) (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon EC2 (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon EMR (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon EMR Containers (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon ElastiCache (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Elastic Block Store (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Elastic Container Registry Public (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Elastic Container Service for Kubernetes (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Elastic File System (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Elastic Inference (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Elastic Transcoder (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Elasticsearch Service (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon EventBridge (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon FSx (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Forecast (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Forecast Query (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Fraud Detector (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Glacier (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon GuardDuty (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon HealthLake (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Honeycode (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Inspector Service (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Interactive Video (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Kinesis (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Kinesis Analytics (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Kinesis Video Signaling Channels (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Kinesis Video Streams (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Lex Model Building (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Lex Model Building V2 (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Lex Runtime V2 (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Lightsail (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Location (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Lookout for Equipment (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Lookout for Metrics (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Lookout for Vision (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Machine Learning (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Macie (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Macie 2 (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Managed Blockchain (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Mechanical Turk Requester (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Neptune (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Personalize (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Personalize Events (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Personalize Runtime (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Pinpoint (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Pinpoint Email (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Pinpoint SMS and Voice (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Polly (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Prometheus (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon QLDB (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon QLDB Session (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon QuickSight (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon RDS (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Redshift (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Rekognition (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Route 53 Auto Naming (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Route 53 Resolver (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Route53 (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon S3 (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon S3 on Outposts (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon SES (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon SNS (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon SQS (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon SWF (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon SageMaker (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon SageMaker Feature Store Runtime (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon SageMaker Runtime (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Sagemaker Edge Manager (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Simple Email (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon SimpleDB (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Snowball (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Textract (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Timestream Query (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Timestream Write (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Transcribe (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon Translate (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon WorkDocs (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon WorkLink (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon WorkMail (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon WorkMail Message Flow (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Amazon WorkSpaces (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AmazonApiGatewayManagementApi (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AmazonApiGatewayV2 (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AmazonMQ (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AmazonMWAA (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AmazonNimbleStudio (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for AmplifyBackend (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Application Migration (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Auto Scaling (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Braket (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for CodeArtifact (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for EC2 Image Builder (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Elastic Load Balancing (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for FinSpace Public API (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for FinSpace User Environment Management (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Firewall Management (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Managed Streaming for Kafka (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Redshift Data API (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Schemas (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Service Quotas (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for Synthetics (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for the AWS CloudHSM (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for the AWS Simple Systems Management (SSM) Service (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for the Amazon EC2 Container Registry (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK for the Amazon EC2 Container Service (from https://aws.amazon.com/sdkforjava)
-- AWS SDK For Java (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - BOM (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - Core (from https://aws.amazon.com/sdkforjava)
-- AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava)
- Adapter: RxJava (from https://github.com/square/retrofit)
- Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations)
- Apache Ant + JUnit (from http://ant.apache.org/, https://ant.apache.org/)
@@ -367,7 +119,6 @@ The following software have components provided under the terms of this license:
- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
- Cloud Key Management Service (KMS) API v1-rev20231012-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
-- CloudWatch Metrics for AWS Java SDK (from https://aws.amazon.com/sdkforjava)
- Cobertura (from http://cobertura.sourceforge.net)
- Cobertura Limited Runtime (from http://cobertura.sourceforge.net)
- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
@@ -439,7 +190,6 @@ The following software have components provided under the terms of this license:
- Jakarta Bean Validation API (from https://beanvalidation.org)
- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
-- Java Libraries for Amazon Simple WorkFlow (from https://github.com/aws/aws-swf-flow-library)
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
@@ -898,13 +648,6 @@ The following software have components provided under the terms of this license:
- aalto-xml (from https://github.com/FasterXML/aalto-xml, https://repo1.maven.org/maven2/com/fasterxml/aalto-xml)
-========================================================================
-Info-ZIP
-========================================================================
-The following software have components provided under the terms of this license:
-
-- ClassGraph (from https://github.com/classgraph/classgraph)
-
========================================================================
LGPL-2.0-only
========================================================================
@@ -953,8 +696,8 @@ The following software have components provided under the terms of this license:
- Azure Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Azure Spring Boot AutoConfigure (from https://github.com/Azure/azure-sdk-for-java, https://github.com/Microsoft/azure-spring-boot)
- Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java)
+- Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/java.html)
- Checker Qual (from https://checkerframework.org)
-- ClassGraph (from https://github.com/classgraph/classgraph)
- Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default)
- JSch (from http://www.jcraft.com/jsch/)
- JTidy (from http://jtidy.sourceforge.net)
@@ -1001,7 +744,6 @@ The following software have components provided under the terms of this license:
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java)
- qpid-proton-j-extensions (from https://github.com/Azure/qpid-proton-j-extensions)
-- webjars-locator-core (from <http://webjars.org>, http://webjars.org)
========================================================================
MPL-1.1
diff --git a/devops/aws/chart/.helmignore b/devops/aws/chart/.helmignore
index 6e238cb1cbd9e264bf7790a760830304695e22a1..95d3192efeb0e0430672e76cf7c08c17530f974f 100644
--- a/devops/aws/chart/.helmignore
+++ b/devops/aws/chart/.helmignore
@@ -1,3 +1,17 @@
+# Copyright © 2020 Amazon Web Services
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
diff --git a/devops/aws/chart/Chart.yaml b/devops/aws/chart/Chart.yaml
index a543ed761b532635f7cc34e505b2cf76d9172efe..e770e88f729485c25496de53dc34fbcf0dafa711 100644
--- a/devops/aws/chart/Chart.yaml
+++ b/devops/aws/chart/Chart.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2020 Amazon Web Services
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
apiVersion: v2
name: os-partition
version: __CHART_VERSION__
diff --git a/devops/aws/chart/templates/NOTES.txt b/devops/aws/chart/templates/NOTES.txt
index f15afa919efb6cf0dc53f0d70283f9ae0dbbcbbb..d23eb4196e1d11c4a0d5d3880ef345592b60f786 100644
--- a/devops/aws/chart/templates/NOTES.txt
+++ b/devops/aws/chart/templates/NOTES.txt
@@ -1,3 +1,16 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
{{ .Chart.Name }} deployed to {{ .Release.Namespace }} namespace
{{- if (.Values.service).apiPath }}
Application URL available at path {{ .Values.service.apiPath }}
diff --git a/devops/aws/chart/templates/authorizationpolicy.yaml b/devops/aws/chart/templates/authorizationpolicy.yaml
index 152ce5933b5417e82031a0ebdd0d7e66cf30e2d5..0c3efee2986dd3f3378c68044ed222efa0016f71 100644
--- a/devops/aws/chart/templates/authorizationpolicy.yaml
+++ b/devops/aws/chart/templates/authorizationpolicy.yaml
@@ -1,4 +1,17 @@
-{{- template "common.authzpolicy" (list . "os-partition.authzpolicy") -}}
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ template "common.authzpolicy" (list . "os-partition.authzpolicy") -}}
{{- define "os-partition.authzpolicy" -}}
## Define overrides for the service authorization policy resource here
{{- end -}}
diff --git a/devops/aws/chart/templates/deployment.yaml b/devops/aws/chart/templates/deployment.yaml
index 122fe268f98e9d7174c7bfdb0abe25168eebd851..e9fc65ffe5bf88a9dab3dc51ba51b90b27d2e103 100644
--- a/devops/aws/chart/templates/deployment.yaml
+++ b/devops/aws/chart/templates/deployment.yaml
@@ -1,4 +1,17 @@
-{{- template "common.deployment" (list . "os-partition.deployment") -}}
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ template "common.deployment" (list . "os-partition.deployment") -}}
{{- define "os-partition.deployment" -}}
## Define overrides for the service deployment resource here
{{- end -}}
\ No newline at end of file
diff --git a/devops/aws/chart/templates/destinationrule.yaml b/devops/aws/chart/templates/destinationrule.yaml
index d90175b8c67205e791a719d9d74f7f9519fa35ff..2f744d79a26d15ec681ee9c712703dbed612db29 100644
--- a/devops/aws/chart/templates/destinationrule.yaml
+++ b/devops/aws/chart/templates/destinationrule.yaml
@@ -1,4 +1,17 @@
-{{- template "common.destinationrule" (list . "os-partition.destinationrule") -}}
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ template "common.destinationrule" (list . "os-partition.destinationrule") -}}
{{- define "os-partition.destinationrule" -}}
## Define overrides for the service destination rule resource here
{{- end -}}
\ No newline at end of file
diff --git a/devops/aws/chart/templates/scaledobject.yaml b/devops/aws/chart/templates/scaledobject.yaml
index 1e25ef8998ffa6e58d9875b959ee33b5abf21ab7..63eb4bc05ff62c99749c3a23606ff1826ecb1537 100644
--- a/devops/aws/chart/templates/scaledobject.yaml
+++ b/devops/aws/chart/templates/scaledobject.yaml
@@ -1,4 +1,17 @@
-{{- template "common.scaledobject" (list . "os-partition.scaledobject") -}}
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ template "common.scaledobject" (list . "os-partition.scaledobject") -}}
{{- define "os-partition.scaledobject" -}}
## Define overrides for the service's scaled object resource here
{{- end -}}
\ No newline at end of file
diff --git a/devops/aws/chart/templates/service.yaml b/devops/aws/chart/templates/service.yaml
index 5687ce56bfb687a9f593fa60908b68aaa7161595..d583ffd93dc6909e5208c5d50300328016a06d8b 100644
--- a/devops/aws/chart/templates/service.yaml
+++ b/devops/aws/chart/templates/service.yaml
@@ -1,4 +1,17 @@
-{{- template "common.service" (list . "os-partition.service") -}}
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ template "common.service" (list . "os-partition.service") -}}
{{- define "os-partition.service" -}}
## Define overrides for the service resource here
{{- end -}}
\ No newline at end of file
diff --git a/devops/aws/chart/templates/serviceaccount.yaml b/devops/aws/chart/templates/serviceaccount.yaml
index f8851f493585e3d6627df785eedc9ea2d3a81f4e..136124fc4d3d8c4741caadf34d3b395c046b0cb7 100644
--- a/devops/aws/chart/templates/serviceaccount.yaml
+++ b/devops/aws/chart/templates/serviceaccount.yaml
@@ -1,4 +1,17 @@
-{{- template "common.serviceaccount" (list . "os-partition.serviceaccount") -}}
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ template "common.serviceaccount" (list . "os-partition.serviceaccount") -}}
{{- define "os-partition.serviceaccount" -}}
## Define overrides for the service's service account resource here
{{- end -}}
\ No newline at end of file
diff --git a/devops/aws/chart/templates/serviceparameters.yaml b/devops/aws/chart/templates/serviceparameters.yaml
index 49a9f58d7d1c544be9437c01543f4ed6ba67820a..c289a028b1963ac6ae2d7324a5525408cff002e5 100644
--- a/devops/aws/chart/templates/serviceparameters.yaml
+++ b/devops/aws/chart/templates/serviceparameters.yaml
@@ -1,4 +1,17 @@
-{{- template "common.serviceparameters" (list . "os-partition.serviceparameters") -}}
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ template "common.serviceparameters" (list . "os-partition.serviceparameters") -}}
{{- define "os-partition.serviceparameters" -}}
## Define overrides for the service parameters here
{{- end -}}
\ No newline at end of file
diff --git a/devops/aws/chart/templates/virtualservice.yaml b/devops/aws/chart/templates/virtualservice.yaml
index 5e9d805dddb6dd25f80625df910292cac32ff075..d5d6d98a0da066ee64c08bd3f710de08b8775785 100644
--- a/devops/aws/chart/templates/virtualservice.yaml
+++ b/devops/aws/chart/templates/virtualservice.yaml
@@ -1,4 +1,17 @@
-{{- template "common.virtualservice" (list . "os-partition.virtualservice") -}}
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ template "common.virtualservice" (list . "os-partition.virtualservice") -}}
{{- define "os-partition.virtualservice" -}}
## Define overrides for the service's virtual service resource here
{{- end -}}
\ No newline at end of file
diff --git a/devops/aws/chart/values.yaml b/devops/aws/chart/values.yaml
index 2db1c01d3456e94cc8d10f19eb763ad0edca6dfd..d9d65c941df3afaf09793a068ed66bbf7ab083e7 100644
--- a/devops/aws/chart/values.yaml
+++ b/devops/aws/chart/values.yaml
@@ -1 +1,15 @@
+# Copyright © 2020 Amazon Web Services
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
image: __CONTAINER__
\ No newline at end of file
diff --git a/partition-core/pom.xml b/partition-core/pom.xml
index 292fe609c87dfb6198a99227ae71c9e819b15082..a9547333286b4c4c75d40bfdf3d1ba81ed3da7d1 100644
--- a/partition-core/pom.xml
+++ b/partition-core/pom.xml
@@ -32,14 +32,14 @@
<java.version>17</java.version>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
- <openapi.version>1.6.9</openapi.version>
+ <openapi.version>1.7.0</openapi.version>
<mockito.core.version>3.4.0</mockito.core.version>
<assertj_core_version>3.16.1</assertj_core_version>
<kotlin_stdlib_version>1.3.60</kotlin_stdlib_version>
<cobertura_maven_plugin_version>2.7</cobertura_maven_plugin_version>
<maven_surefire_plugin_version>3.0.0-M4</maven_surefire_plugin_version>
<maven_failsafe_plugin_version>3.0.0-M4</maven_failsafe_plugin_version>
- <spring-webmvc.version>5.3.22</spring-webmvc.version>
+ <spring-webmvc.version>5.3.30</spring-webmvc.version>
<os-core-common.version>0.24.0</os-core-common.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
</properties>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>5.3.23</version>
+ <version>5.3.30</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -83,6 +83,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <version>3.1.5</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/provider/partition-aws/build-aws/entrypoint.sh b/provider/partition-aws/build-aws/entrypoint.sh
index 3cf30f0bffa9f895aa4048bd75b918156a194eb2..68e1462fb83b378683fe24f947a210f9e0582b5a 100755
--- a/provider/partition-aws/build-aws/entrypoint.sh
+++ b/provider/partition-aws/build-aws/entrypoint.sh
@@ -1,2 +1,16 @@
+# Copyright © 2020 Amazon Web Services
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# --add-opens args used to open modules and allow illegal(reflection\private classes and fields) access from the code.
java $JAVA_OPTS --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED -jar /app.jar
diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml
index 8a1e40d7fca007cfe4885c5ba7192947b3201a94..1f609ea021936e339392115978cedc48a257de5c 100644
--- a/provider/partition-aws/pom.xml
+++ b/provider/partition-aws/pom.xml
@@ -34,29 +34,22 @@
<properties>
<aws.version>1.11.1018</aws.version>
<deployment.environment>dev</deployment.environment>
- <spring-webmvc.version>5.3.22</spring-webmvc.version>
+ <spring-webmvc.version>5.3.24</spring-webmvc.version>
<maven_surefire_plugin_version>3.0.0-M4</maven_surefire_plugin_version>
<junit.version>4.13.2</junit.version>
</properties>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-bom</artifactId>
- <version>${aws.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.13.2.2</version>
+ <version>2.15.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>5.3.23</version>
+ <version>5.3.30</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -66,12 +59,11 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>${os-core-common.version}</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.24.0</version>
+ <version>0.25.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
@@ -80,31 +72,10 @@
</dependency>
<!-- AWS managed packages -->
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>${aws.version}</version>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-dynamodb</artifactId>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-s3</artifactId>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-sns</artifactId>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-cognitoidentity</artifactId>
- </dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-encryption-sdk-java</artifactId>
- <version>2.3.3</version>
+ <version>2.4.0</version>
</dependency>
<!-- Third party Apache 2.0 license packages -->
@@ -116,23 +87,18 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
+ <version>2.7.8</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
+ <version>2.7.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
+ <version>2.7.8</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
@@ -142,6 +108,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <version>1.18.26</version>
</dependency>
<!-- Testing packages -->
@@ -160,6 +127,10 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
@@ -169,11 +140,13 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
+ <version>5.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <version>5.3.30</version>
</dependency>
</dependencies>
diff --git a/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/security/BasicAuthSecurityConfig.java b/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/security/BasicAuthSecurityConfig.java
deleted file mode 100644
index 68a16bb333beda20fb9e62aa8b44401b52d7afc4..0000000000000000000000000000000000000000
--- a/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/security/BasicAuthSecurityConfig.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright © 2020 Amazon Web Services
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-
-package org.opengroup.osdu.partition.provider.aws.security;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.web.SecurityFilterChain;
-
-@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class BasicAuthSecurityConfig {
- @Bean
- public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
- (http.httpBasic().disable())
- .csrf().disable();
- return http.build();
- }
-}
diff --git a/testing/partition-test-aws/pom.xml b/testing/partition-test-aws/pom.xml
index 7904be0b3bf93e6fdf90484f60312506d6323299..9408a62059292447ae7fa28c8d466d6f75b1ce1d 100644
--- a/testing/partition-test-aws/pom.xml
+++ b/testing/partition-test-aws/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.24</version>
+ <version>1.18.28</version>
<scope>provided</scope>
</dependency>
@@ -71,13 +71,17 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.24.0</version>
+ <version>0.25.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.15.3</version>
</dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>27.1-jre</version>
+ <version>30.1.1-jre</version>
</dependency>
<dependency>
diff --git a/testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java b/testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java
index baa931ac761e26a134acb716f3705941c58e2f45..49f099bcf53767e571410cf1aa896c3e58c72745 100644
--- a/testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java
+++ b/testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java
@@ -1,3 +1,17 @@
+// Copyright © Amazon Web Services
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.opengroup.osdu.partition.api;
import org.junit.After;
diff --git a/testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestHealthCheck.java b/testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestHealthCheck.java
index dd0197fb6aa3f6325a569d073757f05659302227..4e1847acc132d555a9508e52bb924f5d1ac0944a 100644
--- a/testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestHealthCheck.java
+++ b/testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestHealthCheck.java
@@ -17,9 +17,16 @@
package org.opengroup.osdu.partition.api;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.junit.After;
import org.junit.Before;
+import org.junit.Test;
import org.opengroup.osdu.partition.util.AwsTestUtils;
+import org.opengroup.osdu.partition.util.TestUtils;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+
+import static org.junit.Assert.assertEquals;
public class TestHealthCheck extends HealthCheckApiTest {
@Before
@@ -33,4 +40,11 @@ public class TestHealthCheck extends HealthCheckApiTest {
public void tearDown() throws Exception {
this.testUtils = null;
}
+ @Override
+ @Test
+ public void should_returnOk() throws Exception {
+ CloseableHttpResponse response =
+ TestUtils.send("api/partition/v1/liveness_check", HttpMethod.GET.name(), testUtils.getAccessToken(), "", "", false);
+ assertEquals(HttpStatus.OK.value(), response.getCode());
+ }
}