Skip to content

Commit

Permalink
chore(java): use "software.amazon.awscdk.core" for core module (#3058)
Browse files Browse the repository at this point in the history
use software.amazon.awscdk.core as the java package name for the core package, so it won't conflict with the old "cdk" package which used software.amazon.awscdk.core

misc: include sdk-api-metadata.json in @aws-cdk/custom-resources
  • Loading branch information
Elad Ben-Israel authored Jun 25, 2019
1 parent 79155e7 commit 76607d7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions packages/@aws-cdk/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"outdir": "dist",
"targets": {
"java": {
"package": "software.amazon.awscdk",
"package": "software.amazon.awscdk.core",
"maven": {
"groupId": "software.amazon.awscdk",
"artifactId": "core"
Expand Down Expand Up @@ -88,4 +88,4 @@
"node": ">= 8.10.0"
},
"stability": "experimental"
}
}
4 changes: 3 additions & 1 deletion packages/@aws-cdk/custom-resources/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ lib/generated/resources.ts
coverage
.nycrc
.LAST_PACKAGE
*.snk
*.snk

lib/sdk-api-metadata.json
1 change: 0 additions & 1 deletion packages/@aws-cdk/custom-resources/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ dist

*.tsbuildinfo

lib/sdk-api-metadata.json
11 changes: 5 additions & 6 deletions tools/pkglint/lib/rules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -485,13 +485,12 @@ function cdkModuleName(name: string) {
const pythonName = name.replace(/^@/g, "").replace(/\//g, ".").split(".").map(caseUtils.kebab).join(".");

return {
javaPackage: `software.amazon.awscdk${(isCdkPkg || isLegacyCdkPkg) ? '' : `.${name.replace(/^aws-/, 'services-').replace(/-/g, '.')}`}`,
javaPackage: `software.amazon.awscdk${isLegacyCdkPkg ? '' : `.${name.replace(/^aws-/, 'services-').replace(/-/g, '.')}`}`,
mavenArtifactId:
isCdkPkg ? 'core'
: isLegacyCdkPkg ? 'cdk'
: name.startsWith('aws-') || name.startsWith('alexa-')
? name.replace(/^aws-/, '')
: `cdk-${name}`,
isLegacyCdkPkg ? 'cdk'
: isCdkPkg ? 'core'
: name.startsWith('aws-') || name.startsWith('alexa-') ? name.replace(/^aws-/, '')
: `cdk-${name}`,
dotnetNamespace: `Amazon.CDK${isCdkPkg ? '' : `.${dotnetSuffix}`}`,
python: {
distName: `aws-cdk.${pythonName}`,
Expand Down

0 comments on commit 76607d7

Please sign in to comment.