From a4499078bc5383e4751d1d6c3c6335f6fa47cc06 Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Fri, 3 Aug 2018 09:40:01 +0200 Subject: [PATCH] Stop using . in artifactId, use - instead, per the usual conventions. (#490) More closely follow the naming used by the Java AWS SDK 2.x --- create-missing-libraries.sh | 4 +-- examples/cdk-examples-java/pom.xml.t.js | 27 ++++++++++++++++--- .../cdk/examples/HelloJavaStack.java | 22 +++++++-------- .../com/amazonaws/cdk/examples/SinkQueue.java | 6 ++--- .../cdk/examples/SinkQueueProps.java | 2 +- .../amazonaws/cdk/examples/SinkQueueTest.java | 4 +-- packages/@aws-cdk/assets/package.json | 2 +- packages/@aws-cdk/aws-apigateway/package.json | 4 +-- .../aws-applicationautoscaling/package.json | 4 +-- packages/@aws-cdk/aws-appsync/package.json | 4 +-- packages/@aws-cdk/aws-athena/package.json | 4 +-- .../@aws-cdk/aws-autoscaling/package.json | 4 +-- .../aws-autoscalingplans/package.json | 4 +-- packages/@aws-cdk/aws-batch/package.json | 4 +-- packages/@aws-cdk/aws-budgets/package.json | 4 +-- .../aws-certificatemanager/package.json | 4 +-- packages/@aws-cdk/aws-cloud9/package.json | 4 +-- .../@aws-cdk/aws-cloudformation/package.json | 4 +-- packages/@aws-cdk/aws-cloudfront/package.json | 4 +-- packages/@aws-cdk/aws-cloudtrail/package.json | 4 +-- packages/@aws-cdk/aws-cloudwatch/package.json | 4 +-- .../aws-codebuild-codepipeline/package.json | 4 +-- packages/@aws-cdk/aws-codebuild/package.json | 4 +-- .../aws-codecommit-codepipeline/package.json | 4 +-- packages/@aws-cdk/aws-codecommit/package.json | 4 +-- packages/@aws-cdk/aws-codedeploy/package.json | 4 +-- .../@aws-cdk/aws-codepipeline/package.json | 4 +-- packages/@aws-cdk/aws-cognito/package.json | 4 +-- packages/@aws-cdk/aws-config/package.json | 4 +-- .../aws-custom-resources/package.json | 4 +-- .../@aws-cdk/aws-datapipeline/package.json | 4 +-- packages/@aws-cdk/aws-dax/package.json | 4 +-- .../aws-directoryservice/package.json | 4 +-- packages/@aws-cdk/aws-dms/package.json | 4 +-- packages/@aws-cdk/aws-dynamodb/package.json | 4 +-- packages/@aws-cdk/aws-ec2/package.json | 4 +-- packages/@aws-cdk/aws-ecr/package.json | 4 +-- packages/@aws-cdk/aws-ecs/package.json | 4 +-- packages/@aws-cdk/aws-efs/package.json | 4 +-- packages/@aws-cdk/aws-eks/package.json | 4 +-- .../@aws-cdk/aws-elasticache/package.json | 4 +-- .../aws-elasticbeanstalk/package.json | 4 +-- .../aws-elasticloadbalancing/package.json | 4 +-- .../aws-elasticloadbalancingv2/package.json | 4 +-- .../@aws-cdk/aws-elasticsearch/package.json | 4 +-- packages/@aws-cdk/aws-emr/package.json | 4 +-- packages/@aws-cdk/aws-events/package.json | 4 +-- packages/@aws-cdk/aws-gamelift/package.json | 4 +-- packages/@aws-cdk/aws-glue/package.json | 4 +-- packages/@aws-cdk/aws-guardduty/package.json | 4 +-- packages/@aws-cdk/aws-iam/package.json | 4 +-- packages/@aws-cdk/aws-inspector/package.json | 4 +-- packages/@aws-cdk/aws-iot/package.json | 4 +-- packages/@aws-cdk/aws-kinesis/package.json | 4 +-- .../aws-kinesisanalytics/package.json | 4 +-- .../@aws-cdk/aws-kinesisfirehose/package.json | 4 +-- packages/@aws-cdk/aws-kms/package.json | 4 +-- .../aws-lambda-codepipeline/package.json | 4 +-- packages/@aws-cdk/aws-lambda/package.json | 4 +-- packages/@aws-cdk/aws-logs/package.json | 4 +-- packages/@aws-cdk/aws-neptune/package.json | 4 +-- packages/@aws-cdk/aws-opsworks/package.json | 4 +-- .../@aws-cdk/aws-quickstarts/package.json | 4 +-- packages/@aws-cdk/aws-rds/package.json | 4 +-- packages/@aws-cdk/aws-redshift/package.json | 4 +-- packages/@aws-cdk/aws-route53/package.json | 4 +-- packages/@aws-cdk/aws-s3/package.json | 4 +-- packages/@aws-cdk/aws-sdb/package.json | 4 +-- packages/@aws-cdk/aws-serverless/package.json | 4 +-- .../@aws-cdk/aws-servicecatalog/package.json | 4 +-- .../aws-servicediscovery/package.json | 4 +-- packages/@aws-cdk/aws-ses/package.json | 4 +-- packages/@aws-cdk/aws-sns/package.json | 4 +-- packages/@aws-cdk/aws-sqs/package.json | 4 +-- packages/@aws-cdk/aws-ssm/package.json | 4 +-- .../@aws-cdk/aws-stepfunctions/package.json | 4 +-- packages/@aws-cdk/aws-waf/package.json | 4 +-- .../@aws-cdk/aws-wafregional/package.json | 4 +-- packages/@aws-cdk/aws-workspaces/package.json | 4 +-- packages/@aws-cdk/cx-api/package.json | 2 +- packages/@aws-cdk/rtv/package.json | 2 +- packages/aws-cdk-docs/src/getting-started.rst | 6 ++--- .../init-templates/app/java/pom.template.xml | 8 +++--- .../main/java/com/myorg/HelloConstruct.java | 4 +-- .../src/main/java/com/myorg/HelloStack.java | 10 +++---- tools/pkglint/lib/rules.ts | 12 +++++---- tools/pkglint/lib/util.ts | 10 +++++-- 87 files changed, 219 insertions(+), 190 deletions(-) diff --git a/create-missing-libraries.sh b/create-missing-libraries.sh index c850f587eb800..a6ca9daa32784 100755 --- a/create-missing-libraries.sh +++ b/create-missing-libraries.sh @@ -58,10 +58,10 @@ EOM "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.${PB}", + "package": "software.amazon.awscdk.services.${PB}", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.${PB}" + "artifactId": "${PB}" } }, "dotnet": { diff --git a/examples/cdk-examples-java/pom.xml.t.js b/examples/cdk-examples-java/pom.xml.t.js index d761c6e4c63b3..25a1e0e39887d 100644 --- a/examples/cdk-examples-java/pom.xml.t.js +++ b/examples/cdk-examples-java/pom.xml.t.js @@ -77,14 +77,35 @@ process.stdout.write(` - com.amazonaws + software.amazon.jsii jsii-runtime ${jsii.version} - com.amazonaws.cdk - aws-cdk + software.amazon.awscdk + cdk + ${cdk.version} + + + + software.amazon.awscdk + ec2 + ${cdk.version} + + + software.amazon.awscdk + s3 + ${cdk.version} + + + software.amazon.awscdk + sns + ${cdk.version} + + + software.amazon.awscdk + sqs ${cdk.version} diff --git a/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/HelloJavaStack.java b/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/HelloJavaStack.java index e3c3f9e7221f2..167ae3b49735b 100644 --- a/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/HelloJavaStack.java +++ b/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/HelloJavaStack.java @@ -4,17 +4,17 @@ import software.amazon.awscdk.Stack; import software.amazon.awscdk.StackProps; import software.amazon.awscdk.Construct; -import software.amazon.awscdk.aws.ec2.AutoScalingGroup; -import software.amazon.awscdk.aws.ec2.AutoScalingGroupProps; -import software.amazon.awscdk.aws.ec2.InstanceType; -import software.amazon.awscdk.aws.ec2.VpcNetwork; -import software.amazon.awscdk.aws.ec2.WindowsImage; -import software.amazon.awscdk.aws.ec2.WindowsVersion; -import software.amazon.awscdk.aws.s3.cloudformation.BucketResource; -import software.amazon.awscdk.aws.s3.cloudformation.BucketResourceProps; -import software.amazon.awscdk.aws.sns.Topic; -import software.amazon.awscdk.aws.sqs.Queue; -import software.amazon.awscdk.aws.sqs.QueueProps; +import software.amazon.awscdk.services.ec2.AutoScalingGroup; +import software.amazon.awscdk.services.ec2.AutoScalingGroupProps; +import software.amazon.awscdk.services.ec2.InstanceType; +import software.amazon.awscdk.services.ec2.VpcNetwork; +import software.amazon.awscdk.services.ec2.WindowsImage; +import software.amazon.awscdk.services.ec2.WindowsVersion; +import software.amazon.awscdk.services.s3.cloudformation.BucketResource; +import software.amazon.awscdk.services.s3.cloudformation.BucketResourceProps; +import software.amazon.awscdk.services.sns.Topic; +import software.amazon.awscdk.services.sqs.Queue; +import software.amazon.awscdk.services.sqs.QueueProps; import java.util.Collections; import java.util.List; diff --git a/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueue.java b/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueue.java index 5fa46296e80f8..179b20fc45b05 100644 --- a/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueue.java +++ b/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueue.java @@ -1,9 +1,9 @@ package software.amazon.awscdk.examples; import software.amazon.awscdk.Construct; -import software.amazon.awscdk.aws.sns.Topic; -import software.amazon.awscdk.aws.sqs.Queue; -import software.amazon.awscdk.aws.sqs.QueueProps; +import software.amazon.awscdk.services.sns.Topic; +import software.amazon.awscdk.services.sqs.Queue; +import software.amazon.awscdk.services.sqs.QueueProps; import java.util.Arrays; import java.util.List; diff --git a/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueueProps.java b/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueueProps.java index 9f76fe013a24b..573ce4ace4861 100644 --- a/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueueProps.java +++ b/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueueProps.java @@ -1,6 +1,6 @@ package software.amazon.awscdk.examples; -import software.amazon.awscdk.aws.sqs.QueueProps; +import software.amazon.awscdk.services.sqs.QueueProps; /** * Props for {@link SinkQueue}. diff --git a/examples/cdk-examples-java/project/src/test/java/com/amazonaws/cdk/examples/SinkQueueTest.java b/examples/cdk-examples-java/project/src/test/java/com/amazonaws/cdk/examples/SinkQueueTest.java index 97a04cbeb3653..aada3ce49da0e 100644 --- a/examples/cdk-examples-java/project/src/test/java/com/amazonaws/cdk/examples/SinkQueueTest.java +++ b/examples/cdk-examples-java/project/src/test/java/com/amazonaws/cdk/examples/SinkQueueTest.java @@ -2,8 +2,8 @@ import software.amazon.awscdk.App; import software.amazon.awscdk.Stack; -import software.amazon.awscdk.aws.sns.Topic; -import software.amazon.awscdk.aws.sqs.QueueProps; +import software.amazon.awscdk.services.sns.Topic; +import software.amazon.awscdk.services.sqs.QueueProps; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.jsii.JsiiException; diff --git a/packages/@aws-cdk/assets/package.json b/packages/@aws-cdk/assets/package.json index 89529a651aafb..ae26dbae49ba7 100644 --- a/packages/@aws-cdk/assets/package.json +++ b/packages/@aws-cdk/assets/package.json @@ -11,7 +11,7 @@ "package": "software.amazon.awscdk.assets", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "assets" + "artifactId": "cdk-assets" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-apigateway/package.json b/packages/@aws-cdk/aws-apigateway/package.json index a01f58b45525b..db98afb44b4f7 100644 --- a/packages/@aws-cdk/aws-apigateway/package.json +++ b/packages/@aws-cdk/aws-apigateway/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.apigateway", + "package": "software.amazon.awscdk.services.apigateway", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.apigateway" + "artifactId": "apigateway" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-applicationautoscaling/package.json b/packages/@aws-cdk/aws-applicationautoscaling/package.json index 33177fd0c54ed..b6fc58a475de9 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/package.json +++ b/packages/@aws-cdk/aws-applicationautoscaling/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.applicationautoscaling", + "package": "software.amazon.awscdk.services.applicationautoscaling", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.applicationautoscaling" + "artifactId": "applicationautoscaling" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-appsync/package.json b/packages/@aws-cdk/aws-appsync/package.json index 87703bbe238dd..4370597999648 100644 --- a/packages/@aws-cdk/aws-appsync/package.json +++ b/packages/@aws-cdk/aws-appsync/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.appsync", + "package": "software.amazon.awscdk.services.appsync", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.appsync" + "artifactId": "appsync" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-athena/package.json b/packages/@aws-cdk/aws-athena/package.json index 7057b2ca9d78d..64fc86dcc6ce3 100644 --- a/packages/@aws-cdk/aws-athena/package.json +++ b/packages/@aws-cdk/aws-athena/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.athena", + "package": "software.amazon.awscdk.services.athena", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.athena" + "artifactId": "athena" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-autoscaling/package.json b/packages/@aws-cdk/aws-autoscaling/package.json index 17e12d408a6b4..00004e3905dd2 100644 --- a/packages/@aws-cdk/aws-autoscaling/package.json +++ b/packages/@aws-cdk/aws-autoscaling/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.autoscaling", + "package": "software.amazon.awscdk.services.autoscaling", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.autoscaling" + "artifactId": "autoscaling" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-autoscalingplans/package.json b/packages/@aws-cdk/aws-autoscalingplans/package.json index 2fa1110943a66..04fafb2d839a7 100644 --- a/packages/@aws-cdk/aws-autoscalingplans/package.json +++ b/packages/@aws-cdk/aws-autoscalingplans/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.autoscalingplans", + "package": "software.amazon.awscdk.services.autoscalingplans", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.autoscalingplans" + "artifactId": "autoscalingplans" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-batch/package.json b/packages/@aws-cdk/aws-batch/package.json index 928cc2814dc92..b70522dd04aa8 100644 --- a/packages/@aws-cdk/aws-batch/package.json +++ b/packages/@aws-cdk/aws-batch/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.batch", + "package": "software.amazon.awscdk.services.batch", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.batch" + "artifactId": "batch" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-budgets/package.json b/packages/@aws-cdk/aws-budgets/package.json index 63390a653b3ed..c914908fcaeb5 100644 --- a/packages/@aws-cdk/aws-budgets/package.json +++ b/packages/@aws-cdk/aws-budgets/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.budgets", + "package": "software.amazon.awscdk.services.budgets", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.budgets" + "artifactId": "budgets" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-certificatemanager/package.json b/packages/@aws-cdk/aws-certificatemanager/package.json index fc25f05886aaa..33097a8e758ff 100644 --- a/packages/@aws-cdk/aws-certificatemanager/package.json +++ b/packages/@aws-cdk/aws-certificatemanager/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.certificatemanager", + "package": "software.amazon.awscdk.services.certificatemanager", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.certificatemanager" + "artifactId": "certificatemanager" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-cloud9/package.json b/packages/@aws-cdk/aws-cloud9/package.json index 01a1ba8180803..c35e9515dca88 100644 --- a/packages/@aws-cdk/aws-cloud9/package.json +++ b/packages/@aws-cdk/aws-cloud9/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.cloud9", + "package": "software.amazon.awscdk.services.cloud9", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.cloud9" + "artifactId": "cloud9" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-cloudformation/package.json b/packages/@aws-cdk/aws-cloudformation/package.json index 65d46b142c5e5..4f7c4685d6079 100644 --- a/packages/@aws-cdk/aws-cloudformation/package.json +++ b/packages/@aws-cdk/aws-cloudformation/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.cloudformation", + "package": "software.amazon.awscdk.services.cloudformation", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.cloudformation" + "artifactId": "cloudformation" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-cloudfront/package.json b/packages/@aws-cdk/aws-cloudfront/package.json index 30c4e8ba7715b..a1ecb44aac78f 100644 --- a/packages/@aws-cdk/aws-cloudfront/package.json +++ b/packages/@aws-cdk/aws-cloudfront/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.cloudfront", + "package": "software.amazon.awscdk.services.cloudfront", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.cloudfront" + "artifactId": "cloudfront" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-cloudtrail/package.json b/packages/@aws-cdk/aws-cloudtrail/package.json index 0672d31fdfdd8..0ddc7818a8f6e 100644 --- a/packages/@aws-cdk/aws-cloudtrail/package.json +++ b/packages/@aws-cdk/aws-cloudtrail/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.cloudtrail", + "package": "software.amazon.awscdk.services.cloudtrail", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.cloudtrail" + "artifactId": "cloudtrail" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-cloudwatch/package.json b/packages/@aws-cdk/aws-cloudwatch/package.json index 05193b06822e4..ad57d647b50a0 100644 --- a/packages/@aws-cdk/aws-cloudwatch/package.json +++ b/packages/@aws-cdk/aws-cloudwatch/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.cloudwatch", + "package": "software.amazon.awscdk.services.cloudwatch", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.cloudwatch" + "artifactId": "cloudwatch" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-codebuild-codepipeline/package.json b/packages/@aws-cdk/aws-codebuild-codepipeline/package.json index ca67400b4810f..f62f9fa83e457 100644 --- a/packages/@aws-cdk/aws-codebuild-codepipeline/package.json +++ b/packages/@aws-cdk/aws-codebuild-codepipeline/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.codebuild.codepipeline", + "package": "software.amazon.awscdk.services.codebuild.codepipeline", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.codebuild.codepipeline" + "artifactId": "codebuild-codepipeline" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-codebuild/package.json b/packages/@aws-cdk/aws-codebuild/package.json index 898912273b911..eff49f44d27f9 100644 --- a/packages/@aws-cdk/aws-codebuild/package.json +++ b/packages/@aws-cdk/aws-codebuild/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.codebuild", + "package": "software.amazon.awscdk.services.codebuild", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.codebuild" + "artifactId": "codebuild" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-codecommit-codepipeline/package.json b/packages/@aws-cdk/aws-codecommit-codepipeline/package.json index 5b05d76e24642..f2cee5ed18b0e 100644 --- a/packages/@aws-cdk/aws-codecommit-codepipeline/package.json +++ b/packages/@aws-cdk/aws-codecommit-codepipeline/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.codecommit.codepipeline", + "package": "software.amazon.awscdk.services.codecommit.codepipeline", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.codecommit.codepipeline" + "artifactId": "codecommit-codepipeline" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-codecommit/package.json b/packages/@aws-cdk/aws-codecommit/package.json index 4f08a8759842e..b68e1d07c8748 100644 --- a/packages/@aws-cdk/aws-codecommit/package.json +++ b/packages/@aws-cdk/aws-codecommit/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.codecommit", + "package": "software.amazon.awscdk.services.codecommit", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.codecommit" + "artifactId": "codecommit" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-codedeploy/package.json b/packages/@aws-cdk/aws-codedeploy/package.json index 7b24bbe5fc015..c5024bad2442b 100644 --- a/packages/@aws-cdk/aws-codedeploy/package.json +++ b/packages/@aws-cdk/aws-codedeploy/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.codedeploy", + "package": "software.amazon.awscdk.services.codedeploy", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.codedeploy" + "artifactId": "codedeploy" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-codepipeline/package.json b/packages/@aws-cdk/aws-codepipeline/package.json index c6be12eb87bb7..c9bb8f453561c 100644 --- a/packages/@aws-cdk/aws-codepipeline/package.json +++ b/packages/@aws-cdk/aws-codepipeline/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.codepipeline", + "package": "software.amazon.awscdk.services.codepipeline", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.codepipeline" + "artifactId": "codepipeline" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-cognito/package.json b/packages/@aws-cdk/aws-cognito/package.json index 80c6984f28d30..877753f50ed3b 100644 --- a/packages/@aws-cdk/aws-cognito/package.json +++ b/packages/@aws-cdk/aws-cognito/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.cognito", + "package": "software.amazon.awscdk.services.cognito", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.cognito" + "artifactId": "cognito" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-config/package.json b/packages/@aws-cdk/aws-config/package.json index 4d0496c7bead9..d633b1e0ffc11 100644 --- a/packages/@aws-cdk/aws-config/package.json +++ b/packages/@aws-cdk/aws-config/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.config", + "package": "software.amazon.awscdk.services.config", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.config" + "artifactId": "config" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-custom-resources/package.json b/packages/@aws-cdk/aws-custom-resources/package.json index 3250abc98408f..1ff6a2593c7a4 100644 --- a/packages/@aws-cdk/aws-custom-resources/package.json +++ b/packages/@aws-cdk/aws-custom-resources/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.custom.resources", + "package": "software.amazon.awscdk.services.customresources", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.custom.resources" + "artifactId": "custom-resources" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-datapipeline/package.json b/packages/@aws-cdk/aws-datapipeline/package.json index 7fe3a7ff7b8ad..009ad9e2e9937 100644 --- a/packages/@aws-cdk/aws-datapipeline/package.json +++ b/packages/@aws-cdk/aws-datapipeline/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.datapipeline", + "package": "software.amazon.awscdk.services.datapipeline", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.datapipeline" + "artifactId": "datapipeline" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-dax/package.json b/packages/@aws-cdk/aws-dax/package.json index 958868ae9abd0..25279b0e8e9cb 100644 --- a/packages/@aws-cdk/aws-dax/package.json +++ b/packages/@aws-cdk/aws-dax/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.dax", + "package": "software.amazon.awscdk.services.dax", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.dax" + "artifactId": "dax" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-directoryservice/package.json b/packages/@aws-cdk/aws-directoryservice/package.json index 00233817d0f4e..821cd7025cd3e 100644 --- a/packages/@aws-cdk/aws-directoryservice/package.json +++ b/packages/@aws-cdk/aws-directoryservice/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.directoryservice", + "package": "software.amazon.awscdk.services.directoryservice", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.directoryservice" + "artifactId": "directoryservice" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-dms/package.json b/packages/@aws-cdk/aws-dms/package.json index d2df10af2d21c..1812fed3f4901 100644 --- a/packages/@aws-cdk/aws-dms/package.json +++ b/packages/@aws-cdk/aws-dms/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.dms", + "package": "software.amazon.awscdk.services.dms", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.dms" + "artifactId": "dms" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-dynamodb/package.json b/packages/@aws-cdk/aws-dynamodb/package.json index 546ecac509aa7..cdc1708cbb4c2 100644 --- a/packages/@aws-cdk/aws-dynamodb/package.json +++ b/packages/@aws-cdk/aws-dynamodb/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.dynamodb", + "package": "software.amazon.awscdk.services.dynamodb", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.dynamodb" + "artifactId": "dynamodb" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-ec2/package.json b/packages/@aws-cdk/aws-ec2/package.json index 23f64148475dc..869cd58d65b73 100644 --- a/packages/@aws-cdk/aws-ec2/package.json +++ b/packages/@aws-cdk/aws-ec2/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.ec2", + "package": "software.amazon.awscdk.services.ec2", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.ec2" + "artifactId": "ec2" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-ecr/package.json b/packages/@aws-cdk/aws-ecr/package.json index 6882786d3c9fd..7ad0d494381d9 100644 --- a/packages/@aws-cdk/aws-ecr/package.json +++ b/packages/@aws-cdk/aws-ecr/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.ecr", + "package": "software.amazon.awscdk.services.ecr", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.ecr" + "artifactId": "ecr" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-ecs/package.json b/packages/@aws-cdk/aws-ecs/package.json index 8fca2e1ccb49a..f2b2727869cfb 100644 --- a/packages/@aws-cdk/aws-ecs/package.json +++ b/packages/@aws-cdk/aws-ecs/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.ecs", + "package": "software.amazon.awscdk.services.ecs", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.ecs" + "artifactId": "ecs" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-efs/package.json b/packages/@aws-cdk/aws-efs/package.json index 1f96ba28394d0..043f6b1a827cf 100644 --- a/packages/@aws-cdk/aws-efs/package.json +++ b/packages/@aws-cdk/aws-efs/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.efs", + "package": "software.amazon.awscdk.services.efs", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.efs" + "artifactId": "efs" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-eks/package.json b/packages/@aws-cdk/aws-eks/package.json index fa3bbea9df0c2..ffdfa9ec2fc5f 100644 --- a/packages/@aws-cdk/aws-eks/package.json +++ b/packages/@aws-cdk/aws-eks/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.eks", + "package": "software.amazon.awscdk.services.eks", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.eks" + "artifactId": "eks" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-elasticache/package.json b/packages/@aws-cdk/aws-elasticache/package.json index c83ffbae52c38..606a609ec30e2 100644 --- a/packages/@aws-cdk/aws-elasticache/package.json +++ b/packages/@aws-cdk/aws-elasticache/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.elasticache", + "package": "software.amazon.awscdk.services.elasticache", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.elasticache" + "artifactId": "elasticache" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-elasticbeanstalk/package.json b/packages/@aws-cdk/aws-elasticbeanstalk/package.json index 21db891b5dcfc..10b1b65d008e5 100644 --- a/packages/@aws-cdk/aws-elasticbeanstalk/package.json +++ b/packages/@aws-cdk/aws-elasticbeanstalk/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.elasticbeanstalk", + "package": "software.amazon.awscdk.services.elasticbeanstalk", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.elasticbeanstalk" + "artifactId": "elasticbeanstalk" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/package.json b/packages/@aws-cdk/aws-elasticloadbalancing/package.json index 59a6bf67596d4..7fa69fd8c1592 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancing/package.json +++ b/packages/@aws-cdk/aws-elasticloadbalancing/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.elasticloadbalancing", + "package": "software.amazon.awscdk.services.elasticloadbalancing", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.elasticloadbalancing" + "artifactId": "elasticloadbalancing" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json b/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json index 27d55a9402a45..8d83510a40ed1 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.elasticloadbalancingv2", + "package": "software.amazon.awscdk.services.elasticloadbalancingv2", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.elasticloadbalancingv2" + "artifactId": "elasticloadbalancingv2" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-elasticsearch/package.json b/packages/@aws-cdk/aws-elasticsearch/package.json index d15e59f5042b8..0ab1c17c4a67d 100644 --- a/packages/@aws-cdk/aws-elasticsearch/package.json +++ b/packages/@aws-cdk/aws-elasticsearch/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.elasticsearch", + "package": "software.amazon.awscdk.services.elasticsearch", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.elasticsearch" + "artifactId": "elasticsearch" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-emr/package.json b/packages/@aws-cdk/aws-emr/package.json index 75f260fc1ea40..fa45e9d50e957 100644 --- a/packages/@aws-cdk/aws-emr/package.json +++ b/packages/@aws-cdk/aws-emr/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.emr", + "package": "software.amazon.awscdk.services.emr", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.emr" + "artifactId": "emr" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-events/package.json b/packages/@aws-cdk/aws-events/package.json index 1c1b53a12cbe7..36d949617138a 100644 --- a/packages/@aws-cdk/aws-events/package.json +++ b/packages/@aws-cdk/aws-events/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.events", + "package": "software.amazon.awscdk.services.events", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.events" + "artifactId": "events" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-gamelift/package.json b/packages/@aws-cdk/aws-gamelift/package.json index 12a9548523a50..91957eef654da 100644 --- a/packages/@aws-cdk/aws-gamelift/package.json +++ b/packages/@aws-cdk/aws-gamelift/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.gamelift", + "package": "software.amazon.awscdk.services.gamelift", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.gamelift" + "artifactId": "gamelift" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-glue/package.json b/packages/@aws-cdk/aws-glue/package.json index 5c6ac4a2bd0ea..6e96aa46e3b51 100644 --- a/packages/@aws-cdk/aws-glue/package.json +++ b/packages/@aws-cdk/aws-glue/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.glue", + "package": "software.amazon.awscdk.services.glue", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.glue" + "artifactId": "glue" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-guardduty/package.json b/packages/@aws-cdk/aws-guardduty/package.json index ae1df066c7844..7f44f27d81723 100644 --- a/packages/@aws-cdk/aws-guardduty/package.json +++ b/packages/@aws-cdk/aws-guardduty/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.guardduty", + "package": "software.amazon.awscdk.services.guardduty", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.guardduty" + "artifactId": "guardduty" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-iam/package.json b/packages/@aws-cdk/aws-iam/package.json index 7ac9cb7099a06..4484af3304a3d 100644 --- a/packages/@aws-cdk/aws-iam/package.json +++ b/packages/@aws-cdk/aws-iam/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.iam", + "package": "software.amazon.awscdk.services.iam", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.iam" + "artifactId": "iam" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-inspector/package.json b/packages/@aws-cdk/aws-inspector/package.json index 739e5c825b012..8a0ffb6174630 100644 --- a/packages/@aws-cdk/aws-inspector/package.json +++ b/packages/@aws-cdk/aws-inspector/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.inspector", + "package": "software.amazon.awscdk.services.inspector", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.inspector" + "artifactId": "inspector" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-iot/package.json b/packages/@aws-cdk/aws-iot/package.json index ea530e82eefd8..484afa326d4b6 100644 --- a/packages/@aws-cdk/aws-iot/package.json +++ b/packages/@aws-cdk/aws-iot/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.iot", + "package": "software.amazon.awscdk.services.iot", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.iot" + "artifactId": "iot" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-kinesis/package.json b/packages/@aws-cdk/aws-kinesis/package.json index 16df991d76a2b..2f185ba554660 100644 --- a/packages/@aws-cdk/aws-kinesis/package.json +++ b/packages/@aws-cdk/aws-kinesis/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.kinesis", + "package": "software.amazon.awscdk.services.kinesis", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.kinesis" + "artifactId": "kinesis" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-kinesisanalytics/package.json b/packages/@aws-cdk/aws-kinesisanalytics/package.json index de656cdbbd8b4..1c1b3cb137e27 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics/package.json +++ b/packages/@aws-cdk/aws-kinesisanalytics/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.kinesisanalytics", + "package": "software.amazon.awscdk.services.kinesisanalytics", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.kinesisanalytics" + "artifactId": "kinesisanalytics" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-kinesisfirehose/package.json b/packages/@aws-cdk/aws-kinesisfirehose/package.json index dc638b7ffbb28..6f4db4bb350fe 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose/package.json +++ b/packages/@aws-cdk/aws-kinesisfirehose/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.kinesisfirehose", + "package": "software.amazon.awscdk.services.kinesisfirehose", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.kinesisfirehose" + "artifactId": "kinesisfirehose" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-kms/package.json b/packages/@aws-cdk/aws-kms/package.json index 72c7741a69127..b9896ad7006b9 100644 --- a/packages/@aws-cdk/aws-kms/package.json +++ b/packages/@aws-cdk/aws-kms/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.kms", + "package": "software.amazon.awscdk.services.kms", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.kms" + "artifactId": "kms" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-lambda-codepipeline/package.json b/packages/@aws-cdk/aws-lambda-codepipeline/package.json index 1072ca708d0b8..5d7f9cf488366 100644 --- a/packages/@aws-cdk/aws-lambda-codepipeline/package.json +++ b/packages/@aws-cdk/aws-lambda-codepipeline/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.lambda.codepipeline", + "package": "software.amazon.awscdk.services.lambda.codepipeline", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.lambda.codepipeline" + "artifactId": "lambda-codepipeline" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-lambda/package.json b/packages/@aws-cdk/aws-lambda/package.json index 2b034396bd658..1e54635650574 100644 --- a/packages/@aws-cdk/aws-lambda/package.json +++ b/packages/@aws-cdk/aws-lambda/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.lambda", + "package": "software.amazon.awscdk.services.lambda", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.lambda" + "artifactId": "lambda" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-logs/package.json b/packages/@aws-cdk/aws-logs/package.json index e6c6da5df6130..0885ca160b944 100644 --- a/packages/@aws-cdk/aws-logs/package.json +++ b/packages/@aws-cdk/aws-logs/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.logs", + "package": "software.amazon.awscdk.services.logs", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.logs" + "artifactId": "logs" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-neptune/package.json b/packages/@aws-cdk/aws-neptune/package.json index cc2ce78d8aed7..20815910f019a 100644 --- a/packages/@aws-cdk/aws-neptune/package.json +++ b/packages/@aws-cdk/aws-neptune/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.neptune", + "package": "software.amazon.awscdk.services.neptune", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.neptune" + "artifactId": "neptune" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-opsworks/package.json b/packages/@aws-cdk/aws-opsworks/package.json index d8ffc7d633a83..d8cf8df71ad67 100644 --- a/packages/@aws-cdk/aws-opsworks/package.json +++ b/packages/@aws-cdk/aws-opsworks/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.opsworks", + "package": "software.amazon.awscdk.services.opsworks", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.opsworks" + "artifactId": "opsworks" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-quickstarts/package.json b/packages/@aws-cdk/aws-quickstarts/package.json index e3816640419f4..6facd5cfc7dd2 100644 --- a/packages/@aws-cdk/aws-quickstarts/package.json +++ b/packages/@aws-cdk/aws-quickstarts/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.quickstarts", + "package": "software.amazon.awscdk.services.quickstarts", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.quickstarts" + "artifactId": "quickstarts" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-rds/package.json b/packages/@aws-cdk/aws-rds/package.json index 0ed93667b952f..92e089aae6945 100644 --- a/packages/@aws-cdk/aws-rds/package.json +++ b/packages/@aws-cdk/aws-rds/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.rds", + "package": "software.amazon.awscdk.services.rds", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.rds" + "artifactId": "rds" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-redshift/package.json b/packages/@aws-cdk/aws-redshift/package.json index 1527168f581bf..fa3411b8d9e8d 100644 --- a/packages/@aws-cdk/aws-redshift/package.json +++ b/packages/@aws-cdk/aws-redshift/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.redshift", + "package": "software.amazon.awscdk.services.redshift", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.redshift" + "artifactId": "redshift" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-route53/package.json b/packages/@aws-cdk/aws-route53/package.json index 3ef5c6eebf674..b69176335d829 100644 --- a/packages/@aws-cdk/aws-route53/package.json +++ b/packages/@aws-cdk/aws-route53/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.route53", + "package": "software.amazon.awscdk.services.route53", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.route53" + "artifactId": "route53" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-s3/package.json b/packages/@aws-cdk/aws-s3/package.json index aae08f86b6237..28387302b77a0 100644 --- a/packages/@aws-cdk/aws-s3/package.json +++ b/packages/@aws-cdk/aws-s3/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.s3", + "package": "software.amazon.awscdk.services.s3", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.s3" + "artifactId": "s3" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-sdb/package.json b/packages/@aws-cdk/aws-sdb/package.json index f999b0faa58da..2e5af0851b73c 100644 --- a/packages/@aws-cdk/aws-sdb/package.json +++ b/packages/@aws-cdk/aws-sdb/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.sdb", + "package": "software.amazon.awscdk.services.sdb", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.sdb" + "artifactId": "sdb" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-serverless/package.json b/packages/@aws-cdk/aws-serverless/package.json index 0a2934b8f3e64..fb888a2a1c7f2 100644 --- a/packages/@aws-cdk/aws-serverless/package.json +++ b/packages/@aws-cdk/aws-serverless/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.serverless", + "package": "software.amazon.awscdk.services.serverless", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.serverless" + "artifactId": "serverless" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-servicecatalog/package.json b/packages/@aws-cdk/aws-servicecatalog/package.json index e8d04d680a675..31dd9fb607d99 100644 --- a/packages/@aws-cdk/aws-servicecatalog/package.json +++ b/packages/@aws-cdk/aws-servicecatalog/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.servicecatalog", + "package": "software.amazon.awscdk.services.servicecatalog", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.servicecatalog" + "artifactId": "servicecatalog" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-servicediscovery/package.json b/packages/@aws-cdk/aws-servicediscovery/package.json index ccb8300c33089..6ce5b7added1c 100644 --- a/packages/@aws-cdk/aws-servicediscovery/package.json +++ b/packages/@aws-cdk/aws-servicediscovery/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.servicediscovery", + "package": "software.amazon.awscdk.services.servicediscovery", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.servicediscovery" + "artifactId": "servicediscovery" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-ses/package.json b/packages/@aws-cdk/aws-ses/package.json index ca8e933656012..8ca80ab3a35eb 100644 --- a/packages/@aws-cdk/aws-ses/package.json +++ b/packages/@aws-cdk/aws-ses/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.ses", + "package": "software.amazon.awscdk.services.ses", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.ses" + "artifactId": "ses" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-sns/package.json b/packages/@aws-cdk/aws-sns/package.json index d60525e3e935f..da7ae83497745 100644 --- a/packages/@aws-cdk/aws-sns/package.json +++ b/packages/@aws-cdk/aws-sns/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.sns", + "package": "software.amazon.awscdk.services.sns", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.sns" + "artifactId": "sns" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-sqs/package.json b/packages/@aws-cdk/aws-sqs/package.json index a449ac470e9cb..1eca3a52323f4 100644 --- a/packages/@aws-cdk/aws-sqs/package.json +++ b/packages/@aws-cdk/aws-sqs/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.sqs", + "package": "software.amazon.awscdk.services.sqs", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.sqs" + "artifactId": "sqs" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-ssm/package.json b/packages/@aws-cdk/aws-ssm/package.json index 35b4c8b52c7ac..18e64c5c708af 100644 --- a/packages/@aws-cdk/aws-ssm/package.json +++ b/packages/@aws-cdk/aws-ssm/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.ssm", + "package": "software.amazon.awscdk.services.ssm", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.ssm" + "artifactId": "ssm" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-stepfunctions/package.json b/packages/@aws-cdk/aws-stepfunctions/package.json index eb65bcf93ecc4..d6ff4bf43be14 100644 --- a/packages/@aws-cdk/aws-stepfunctions/package.json +++ b/packages/@aws-cdk/aws-stepfunctions/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.stepfunctions", + "package": "software.amazon.awscdk.services.stepfunctions", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.stepfunctions" + "artifactId": "stepfunctions" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-waf/package.json b/packages/@aws-cdk/aws-waf/package.json index 0d04550f79383..b20504812848b 100644 --- a/packages/@aws-cdk/aws-waf/package.json +++ b/packages/@aws-cdk/aws-waf/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.waf", + "package": "software.amazon.awscdk.services.waf", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.waf" + "artifactId": "waf" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-wafregional/package.json b/packages/@aws-cdk/aws-wafregional/package.json index 6b54d62c906e2..d50aacd06c499 100644 --- a/packages/@aws-cdk/aws-wafregional/package.json +++ b/packages/@aws-cdk/aws-wafregional/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.wafregional", + "package": "software.amazon.awscdk.services.waf.regional", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.wafregional" + "artifactId": "wafregional" } }, "dotnet": { diff --git a/packages/@aws-cdk/aws-workspaces/package.json b/packages/@aws-cdk/aws-workspaces/package.json index e6a6cdca41955..1bb6734bec5cf 100644 --- a/packages/@aws-cdk/aws-workspaces/package.json +++ b/packages/@aws-cdk/aws-workspaces/package.json @@ -8,10 +8,10 @@ "outdir": "dist", "targets": { "java": { - "package": "software.amazon.awscdk.aws.workspaces", + "package": "software.amazon.awscdk.services.workspaces", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "aws.workspaces" + "artifactId": "workspaces" } }, "dotnet": { diff --git a/packages/@aws-cdk/cx-api/package.json b/packages/@aws-cdk/cx-api/package.json index 8365ca3f9606f..4b96f34eebbf9 100644 --- a/packages/@aws-cdk/cx-api/package.json +++ b/packages/@aws-cdk/cx-api/package.json @@ -11,7 +11,7 @@ "package": "software.amazon.awscdk.cxapi", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "cxapi" + "artifactId": "cdk-cx-api" } }, "dotnet": { diff --git a/packages/@aws-cdk/rtv/package.json b/packages/@aws-cdk/rtv/package.json index a454e01e866d5..35eb69afea434 100644 --- a/packages/@aws-cdk/rtv/package.json +++ b/packages/@aws-cdk/rtv/package.json @@ -11,7 +11,7 @@ "package": "software.amazon.awscdk.rtv", "maven": { "groupId": "software.amazon.awscdk", - "artifactId": "rtv" + "artifactId": "cdk-rtv" } }, "dotnet": { diff --git a/packages/aws-cdk-docs/src/getting-started.rst b/packages/aws-cdk-docs/src/getting-started.rst index c78072f80a039..2a65afaef899c 100644 --- a/packages/aws-cdk-docs/src/getting-started.rst +++ b/packages/aws-cdk-docs/src/getting-started.rst @@ -597,7 +597,7 @@ Install the **@aws-cdk/aws-s3** package: software.amazon.awscdk - aws.s3 + s3 @@ -657,8 +657,8 @@ the :py:class:`Bucket <@aws-cdk/aws-s3.Bucket>` class: import software.amazon.awscdk.App; import software.amazon.awscdk.Stack; - import software.amazon.awscdk.aws.s3.Bucket; - import software.amazon.awscdk.aws.s3.BucketProps; + import software.amazon.awscdk.services.s3.Bucket; + import software.amazon.awscdk.services.s3.BucketProps; public class MyStack extends Stack { public MyStack(final App parent, final String id) { diff --git a/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml b/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml index 68ec651a7eb25..2bf05b618696e 100644 --- a/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml +++ b/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml @@ -54,22 +54,22 @@ software.amazon.awscdk - aws.iam + iam %cdk-version% software.amazon.awscdk - aws.s3 + s3 %cdk-version% software.amazon.awscdk - aws.sns + sns %cdk-version% software.amazon.awscdk - aws.sqs + sqs %cdk-version% diff --git a/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/HelloConstruct.java b/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/HelloConstruct.java index 622a5cb1916c3..c001a279f70fa 100644 --- a/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/HelloConstruct.java +++ b/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/HelloConstruct.java @@ -1,8 +1,8 @@ package com.myorg; import software.amazon.awscdk.Construct; -import software.amazon.awscdk.aws.iam.IIdentityResource; -import software.amazon.awscdk.aws.s3.Bucket; +import software.amazon.awscdk.services.iam.IIdentityResource; +import software.amazon.awscdk.services.s3.Bucket; import java.util.ArrayList; import java.util.List; diff --git a/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/HelloStack.java b/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/HelloStack.java index 8e29475dc6cb1..f351203771146 100644 --- a/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/HelloStack.java +++ b/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/HelloStack.java @@ -3,11 +3,11 @@ import software.amazon.awscdk.App; import software.amazon.awscdk.Stack; import software.amazon.awscdk.StackProps; -import software.amazon.awscdk.aws.iam.User; -import software.amazon.awscdk.aws.sns.Topic; -import software.amazon.awscdk.aws.sns.TopicProps; -import software.amazon.awscdk.aws.sqs.Queue; -import software.amazon.awscdk.aws.sqs.QueueProps; +import software.amazon.awscdk.services.iam.User; +import software.amazon.awscdk.services.sns.Topic; +import software.amazon.awscdk.services.sns.TopicProps; +import software.amazon.awscdk.services.sqs.Queue; +import software.amazon.awscdk.services.sqs.QueueProps; public class HelloStack extends Stack { public HelloStack(final App parent, final String name) { diff --git a/tools/pkglint/lib/rules.ts b/tools/pkglint/lib/rules.ts index fd77d91ef65f9..f68c0188644e7 100644 --- a/tools/pkglint/lib/rules.ts +++ b/tools/pkglint/lib/rules.ts @@ -145,10 +145,10 @@ export class JSIIJavaPackageIsRequired extends ValidationRule { const moduleName = cdkModuleName(pkg.json.name); expectJSON(pkg, 'jsii.targets.java.maven.groupId', 'software.amazon.awscdk'); - expectJSON(pkg, 'jsii.targets.java.maven.artifactId', moduleName.mavenArtifactId, /./g); + expectJSON(pkg, 'jsii.targets.java.maven.artifactId', moduleName.mavenArtifactId, /-/g); const java = deepGet(pkg.json, ['jsii', 'targets', 'java', 'package']) as string | undefined; - expectJSON(pkg, 'jsii.targets.java.package', moduleName.javaPackage, /./g); + expectJSON(pkg, 'jsii.targets.java.package', moduleName.javaPackage, /\./g); if (java) { const expectedPrefix = moduleName.javaPackage.split('.').slice(0, 3).join('.'); const actualPrefix = java.split('.').slice(0, 3).join('.'); @@ -214,8 +214,10 @@ function cdkModuleName(name: string) { const dotnetSuffix = name.split('-').map(s => s === 'aws' ? 'AWS' : caseUtils.pascal(s)).join('.'); return { - javaPackage: `software.amazon.awscdk${isCdkPkg ? '' : `.${name.replace(/-/g, '.')}`}`, - mavenArtifactId: isCdkPkg ? 'cdk' : name.replace(/-/g, '.'), + javaPackage: `software.amazon.awscdk${isCdkPkg ? '' : `.${name.replace(/^aws-/, 'services-').replace(/-/g, '.')}`}`, + mavenArtifactId: isCdkPkg ? 'cdk' + : name.startsWith('aws-') ? name.replace(/^aws-/, '') + : `cdk-${name}`, dotnetNamespace: `Amazon.CDK${isCdkPkg ? '' : `.${dotnetSuffix}`}` }; } @@ -229,7 +231,7 @@ export class JSIIDotNetNamespaceIsRequired extends ValidationRule { const dotnet = deepGet(pkg.json, ['jsii', 'targets', 'dotnet', 'namespace']) as string | undefined; const moduleName = cdkModuleName(pkg.json.name); - expectJSON(pkg, 'jsii.targets.dotnet.namespace', moduleName.dotnetNamespace, /./g); + expectJSON(pkg, 'jsii.targets.dotnet.namespace', moduleName.dotnetNamespace, /\./g, /*case insensitive*/ true); if (dotnet) { const actualPrefix = dotnet.split('.').slice(0, 2).join('.'); diff --git a/tools/pkglint/lib/util.ts b/tools/pkglint/lib/util.ts index a4b045101ab86..955944607bec5 100644 --- a/tools/pkglint/lib/util.ts +++ b/tools/pkglint/lib/util.ts @@ -5,10 +5,10 @@ import { PackageJson } from "./packagejson"; /** * Expect a particular JSON key to be a given value */ -export function expectJSON(pkg: PackageJson, jsonPath: string, expected: any, ignore?: RegExp) { +export function expectJSON(pkg: PackageJson, jsonPath: string, expected: any, ignore?: RegExp, caseInsensitive: boolean = false) { const parts = jsonPath.split('.'); const actual = deepGet(pkg.json, parts); - if (applyIgnore(actual) !== applyIgnore(expected)) { + if (applyCaseInsensitive(applyIgnore(actual)) !== applyCaseInsensitive(applyIgnore(expected))) { pkg.report({ message: `${jsonPath} should be ${JSON.stringify(expected)}${ignore ? ` (ignoring ${ignore})` : ''}, is ${JSON.stringify(actual)}`, fix: () => { deepSet(pkg.json, parts, expected); } @@ -20,6 +20,12 @@ export function expectJSON(pkg: PackageJson, jsonPath: string, expected: any, ig const str = JSON.stringify(val); return str.replace(ignore, ''); } + + function applyCaseInsensitive(val: any): any { + if (!caseInsensitive || val == null) { return val; } + const str = JSON.stringify(val); + return str.toLowerCase(); + } } /**