Merge cleanup: fix some missing changes

Author: scottgerring

.github/workflows/pr_build.yml

@@ -73,7 +73,7 @@ jobs:
         run: ./gradlew build
       - name: Build Gradle Example - Kotlin
         if: ${{ matrix.java == '8' }} # Gradle example can only be built on Java 8
-        working-directory: examples/powertools-examples-core/kotlin
+        working-directory: examples/powertools-examples-core-utilities/kotlin
         run: ./gradlew build
       - name: Setup Terraform
         if: ${{ matrix.java == '11' }}

examples/README.md

@@ -6,11 +6,11 @@ Each example can be copied from its subdirectory and used independently of the r
 ## Examples
 
 * [powertools-examples-core](powertools-examples-core) - Demonstrates the core logging, tracing, and metrics modules with different build tools and languages 
-  * [CDK](./powertools-examples-core/cdk)
-  * [Gradle](./powertools-examples-core/gradle)
-  * [SAM](./powertools-examples-core/sam) 
-  * [Serverless](./powertools-examples-core/serverless)
-  * [Kotlin](./powertools-examples-core/kotlin)
+  * [CDK](./powertools-examples-core-utilities/cdk)
+  * [Gradle](./powertools-examples-core-utilities/gradle)
+  * [SAM](./powertools-examples-core-utilities/sam) 
+  * [Serverless](./powertools-examples-core-utilities/serverless)
+  * [Kotlin](./powertools-examples-core-utilities/kotlin)
 * [powertools-examples-idempotency](powertools-examples-idempotency) - An idempotent HTTP API
 * [powertools-examples-parameters](powertools-examples-parameters) - Uses the parameters module to provide runtime parameters to a function
 * [powertools-examples-serialization](powertools-examples-serialization) - Uses the serialization module to serialize and deserialize API Gateway & SQS payloads

examples/powertools-examples-core-utilities/kotlin/build.gradle.kts

@@ -14,9 +14,9 @@ dependencies {
     implementation("com.fasterxml.jackson.core:jackson-databind:2.13.2.2")
     implementation("com.amazonaws:aws-lambda-java-events:3.11.0")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2")
-    aspect("software.amazon.lambda:powertools-tracing:1.18.0-SNAPSHOT")
-    aspect("software.amazon.lambda:powertools-logging:1.18.0-SNAPSHOT")
-    aspect("software.amazon.lambda:powertools-metrics:1.18.0-SNAPSHOT")
+    aspect("software.amazon.lambda:powertools-tracing:2.0.0-SNAPSHOT")
+    aspect("software.amazon.lambda:powertools-logging:2.0.0-SNAPSHOT")
+    aspect("software.amazon.lambda:powertools-metrics:2.0.0-SNAPSHOT")
     testImplementation("junit:junit:4.13.2")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 }

examples/powertools-examples-core-utilities/terraform/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>software.amazon.lambda.examples</groupId>
-    <version>1.18.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <artifactId>powertools-examples-core-terraform</artifactId>
     <packaging>jar</packaging>