Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
guyernest committed Oct 10, 2023
2 parents 5922652 + 7082ecc commit 070ac51
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 21 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/issue-label-assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ env:
{"area":"@aws-cdk/aws-s3outposts","keywords":["aws-s3outposts","s3outposts"],"labels":["@aws-cdk/aws-s3outposts"]},
{"area":"@aws-cdk/aws-sagemaker","keywords":["aws-sagemaker","sagemaker"],"labels":["@aws-cdk/aws-sagemaker"]},
{"area":"@aws-cdk/aws-sam","keywords":["serverless-application-model","aws-sam","sam"],"labels":["@aws-cdk/aws-sam"]},
{"area":"@aws-cdk/aws-scheduler","keywords":["aws-scheduler","scheduler"],"labels":["@aws-cdk/aws-scheduler"]},
{"area":"@aws-cdk/aws-scheduler-targets","keywords":["aws-scheduler-targets","scheduler-targets"],"labels":["@aws-cdk/aws-scheduler-targets"]},
{"area":"@aws-cdk/aws-sdb","keywords":["simpledb","aws-sdb","sdb"],"labels":["@aws-cdk/aws-sdb"]},
{"area":"@aws-cdk/aws-secretsmanager","keywords":["secret","aws-secretsmanager","secrets-manager"],"labels":["@aws-cdk/aws-secretsmanager"]},
{"area":"@aws-cdk/aws-securityhub","keywords":["aws-securityhub","security-hub"],"labels":["@aws-cdk/aws-securityhub"]},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/request-cli-integ-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
persist-credentials: false
- name: Find changed cli files
id: changed-cli-files
uses: tj-actions/changed-files@8238a4103220c636f2dad328ead8a7c8dbe316a3
uses: tj-actions/changed-files@db153baf731265ad02cd490b07f470e2d55e3345
with:
base_sha: ${{ github.event.pull_request.base.sha }}
files_yaml: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/v2-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ jobs:
yarn install --frozen-lockfile
yarn pkglint
- name: push
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: 'automatic pkglint fixes'
7 changes: 3 additions & 4 deletions packages/aws-cdk/lib/init-templates/app/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<release>17</release>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<configuration>
<mainClass>com.myorg.%name.PascalCased%App</mainClass>
</configuration>
Expand Down
8 changes: 4 additions & 4 deletions packages/aws-cdk/lib/init-templates/sample-app/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<release>17</release>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<configuration>
<mainClass>com.myorg.%name.PascalCased%App</mainClass>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions tools/@aws-cdk/spec2cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-cdk/aws-service-spec": "^0.0.18",
"@aws-cdk/service-spec-types": "^0.0.18",
"@aws-cdk/aws-service-spec": "^0.0.19",
"@aws-cdk/service-spec-types": "^0.0.19",
"@cdklabs/tskb": "^0.0.1",
"@cdklabs/typewriter": "^0.0.2",
"camelcase": "^6",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -55,23 +55,23 @@
resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.0.1.tgz#6dc9b7cdb22ff622a7176141197962360c33e9ac"
integrity sha512-DDt4SLdLOwWCjGtltH4VCST7hpOI5DzieuhGZsBpZ+AgJdSI2GCjklCXm0GCTwJG/SolkL5dtQXyUKgg9luBDg==

"@aws-cdk/aws-service-spec@^0.0.18":
version "0.0.18"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.18.tgz#f0284514ce2c0c13ca6a1cc05dfb7b79d75a1409"
integrity sha512-ei/t8HhJiCwCHvHyTeLPj9TLp8QEymEexAyrvCJFopjNPwY3MGEOSAOeVhmuVrzwCwCXylSmpez0hSkv4w+kWQ==
"@aws-cdk/aws-service-spec@^0.0.19":
version "0.0.19"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.19.tgz#60f70fa2ddbe2bcd948de7eac986868b6da23fab"
integrity sha512-t7Bjy3QR7A9JK3Vr90iuj+6HUJ2qxajtTkmUoqWUN9xfVxGFvrJvDaKdyvqQR/sTPPt0HUT4hP7OvCn3hzdFoQ==
dependencies:
"@aws-cdk/service-spec-types" "^0.0.18"
"@aws-cdk/service-spec-types" "^0.0.19"
"@cdklabs/tskb" "^0.0.1"

"@aws-cdk/lambda-layer-kubectl-v24@^2.0.242":
version "2.0.242"
resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v24/-/lambda-layer-kubectl-v24-2.0.242.tgz#4273a5ad7714f933a7eba155eb9280823086db71"
integrity sha512-7/wIOo685tmrEe4hh6zqDELhBZh5OQGf3Hd2FU2Vnwy2ZubW8qTmEw5gqJCsCrGKeYDoa1BcVhDRZ/nzjkaqyA==

"@aws-cdk/service-spec-types@^0.0.18":
version "0.0.18"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.18.tgz#deaabcb63efad83ecf1c656f0653c146a2eae99d"
integrity sha512-Ru9VcbAezK5BvyOwK5DBMpeO/yGcS3Yc8jt7sQYtshBWQypq423m6KvcwCBB9gT/ZRZQ701aSYUcXwcBubXkDg==
"@aws-cdk/service-spec-types@^0.0.19":
version "0.0.19"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.19.tgz#ad305f0a795620844de2730e974a29bb19c028d6"
integrity sha512-CrONdQo1bgF8vfvLOL6o2t2sLtETwHjI/mbPqxSO6Xp55RgjVPZGLKzOR4kmx6zmbXvvV6ioWZwfz2jcGAVGtQ==
dependencies:
"@cdklabs/tskb" "^0.0.1"

Expand Down

0 comments on commit 070ac51

Please sign in to comment.