Stop using . in artifactId, use - instead, per the usual conventions. (…

…#490) More closely follow the naming used by the Java AWS SDK 2.x
aws · Aug 3, 2018 · a449907 · a449907
1 parent f5ca82b
commit a449907
Show file tree

Hide file tree

Showing 87 changed files with 219 additions and 190 deletions.
diff --git 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
@@ -77,14 +77,35 @@ process.stdout.write(`
 
     <dependencies>
         <dependency>
-            <groupId>com.amazonaws</groupId>
+            <groupId>software.amazon.jsii</groupId>
             <artifactId>jsii-runtime</artifactId>
             <version>${jsii.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws.cdk</groupId>
-            <artifactId>aws-cdk</artifactId>
+            <groupId>software.amazon.awscdk</groupId>
+            <artifactId>cdk</artifactId>
+            <version>${cdk.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awscdk</groupId>
+            <artifactId>ec2</artifactId>
+            <version>${cdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awscdk</groupId>
+            <artifactId>s3</artifactId>
+            <version>${cdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awscdk</groupId>
+            <artifactId>sns</artifactId>
+            <version>${cdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awscdk</groupId>
+            <artifactId>sqs</artifactId>
             <version>${cdk.version}</version>
         </dependency>
 

diff --git a/...es/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/HelloJavaStack.java b/...es/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
@@ -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/...es/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueueProps.java b/...es/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/...les/cdk-examples-java/project/src/test/java/com/amazonaws/cdk/examples/SinkQueueTest.java b/...les/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": {