Skip to content

Commit 4dd2f19

Browse files
scottgerringscottgerring
committed
Merge cleanup
1 parent 8118eb8 commit 4dd2f19

File tree

9 files changed

+14
-111
lines changed

9 files changed

+14
-111
lines changed

‎examples/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
</description>
3030

3131
<modules>
32-
<module>powertools-examples-core/sam</module>
33-
<module>powertools-examples-core/cdk/app</module>
34-
<module>powertools-examples-core/cdk/infra</module>
35-
<module>powertools-examples-core/serverless</module>
32+
<module>powertools-examples-core-utilities/sam</module>
33+
<module>powertools-examples-core-utilities/cdk/app</module>
34+
<module>powertools-examples-core-utilities/cdk/infra</module>
35+
<module>powertools-examples-core-utilities/serverless</module>
3636
<module>powertools-examples-idempotency</module>
3737
<module>powertools-examples-parameters</module>
3838
<module>powertools-examples-serialization</module>

‎examples/powertools-examples-batch/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<maven.compiler.source>1.8</maven.compiler.source>
1616
<maven.compiler.target>1.8</maven.compiler.target>
1717
<sdk.version>2.20.152</sdk.version>
18+
<aspectj.version>1.9.20</aspectj.version>
19+
1820
</properties>
1921

2022
<dependencies>

‎examples/powertools-examples-cloudformation/pom.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>software.amazon.lambda.examples</groupId>
6-
<version>1.17.0-SNAPSHOT</version>
6+
<version>2.0.0-SNAPSHOT</version>
77
<artifactId>powertools-examples-cloudformation</artifactId>
88
<packaging>jar</packaging>
99

@@ -16,6 +16,8 @@
1616
<lambda.core.version>1.2.3</lambda.core.version>
1717
<lambda.events.version>3.11.3</lambda.events.version>
1818
<aws.sdk.version>2.20.162</aws.sdk.version>
19+
<aspectj.version>1.9.20</aspectj.version>
20+
1921
</properties>
2022
<dependencyManagement>
2123
<dependencies>

‎examples/powertools-examples-core-utilities/cdk/app/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>software.amazon.lambda.examples</groupId>
6-
<version>1.20.0</version>
6+
<version>2.0.0-SNAPSHOT</version>
77
<artifactId>powertools-examples-core-utilities-cdk</artifactId>
88
<packaging>jar</packaging>
99
<name>Powertools for AWS Lambda (Java) library Examples - Core</name>

‎examples/powertools-examples-core-utilities/sam/pom.xml

+1-87
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,17 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5+
<name>Powertools for AWS Lambda (Java) library Examples - Core Utilities (logging, tracing, metrics) with SAM</name>
56
<groupId>software.amazon.lambda.examples</groupId>
6-
<<<<<<<< HEAD:examples/powertools-examples-core-utilities/sam/pom.xml
77
<version>2.0.0-SNAPSHOT</version>
88
<artifactId>powertools-examples-core-utilities-sam</artifactId>
99
<packaging>jar</packaging>
10-
11-
<name>Powertools for AWS Lambda (Java) library Examples - Core Utilities (logging, tracing, metrics) with SAM</name>
12-
========
13-
<version>1.16.1</version>
14-
<artifactId>powertools-examples-core-cdk</artifactId>
15-
<packaging>jar</packaging>
16-
17-
<name>Powertools for AWS Lambda (Java) library Examples - Core</name>
18-
>>>>>>>> main:examples/powertools-examples-core/cdk/app/pom.xml
1910

2011
<properties>
2112
<log4j.version>2.20.0</log4j.version>
2213
<maven.compiler.source>1.8</maven.compiler.source>
2314
<maven.compiler.target>1.8</maven.compiler.target>
24-
<<<<<<<< HEAD:examples/powertools-examples-core-utilities/sam/pom.xml
2515
<aspectj.version>1.9.20</aspectj.version>
26-
========
27-
>>>>>>>> main:examples/powertools-examples-core/cdk/app/pom.xml
2816
</properties>
2917

3018
<dependencies>
@@ -51,11 +39,7 @@
5139
<dependency>
5240
<groupId>com.amazonaws</groupId>
5341
<artifactId>aws-lambda-java-events</artifactId>
54-
<<<<<<<< HEAD:examples/powertools-examples-core-utilities/sam/pom.xml
55-
<version>3.11.2</version>
56-
========
5742
<version>3.11.3</version>
58-
>>>>>>>> main:examples/powertools-examples-core/cdk/app/pom.xml
5943
</dependency>
6044
<dependency>
6145
<groupId>org.apache.logging.log4j</groupId>
@@ -82,7 +66,6 @@
8266
</dependencies>
8367

8468
<build>
85-
<<<<<<<< HEAD:examples/powertools-examples-core-utilities/sam/pom.xml
8669
<plugins>
8770
<plugin>
8871
<groupId>dev.aspectj</groupId>
@@ -148,75 +131,6 @@
148131
</dependencies>
149132
</plugin>
150133
</plugins>
151-
========
152-
<finalName>helloworld-lambda</finalName>
153-
<plugins>
154-
<plugin>
155-
<groupId>dev.aspectj</groupId>
156-
<artifactId>aspectj-maven-plugin</artifactId>
157-
<version>1.13.1</version>
158-
<configuration>
159-
<source>${maven.compiler.source}</source>
160-
<target>${maven.compiler.target}</target>
161-
<complianceLevel>${maven.compiler.target}</complianceLevel>
162-
<aspectLibraries>
163-
<aspectLibrary>
164-
<groupId>software.amazon.lambda</groupId>
165-
<artifactId>powertools-tracing</artifactId>
166-
</aspectLibrary>
167-
<aspectLibrary>
168-
<groupId>software.amazon.lambda</groupId>
169-
<artifactId>powertools-logging</artifactId>
170-
</aspectLibrary>
171-
<aspectLibrary>
172-
<groupId>software.amazon.lambda</groupId>
173-
<artifactId>powertools-metrics</artifactId>
174-
</aspectLibrary>
175-
</aspectLibraries>
176-
</configuration>
177-
<executions>
178-
<execution>
179-
<goals>
180-
<goal>compile</goal>
181-
</goals>
182-
</execution>
183-
</executions>
184-
</plugin>
185-
<plugin>
186-
<groupId>org.apache.maven.plugins</groupId>
187-
<artifactId>maven-shade-plugin</artifactId>
188-
<version>3.5.0</version>
189-
<executions>
190-
<execution>
191-
<phase>package</phase>
192-
<goals>
193-
<goal>shade</goal>
194-
</goals>
195-
<configuration>
196-
<transformers>
197-
<transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
198-
</transformers>
199-
</configuration>
200-
</execution>
201-
</executions>
202-
<dependencies>
203-
<dependency>
204-
<groupId>org.apache.logging.log4j</groupId>
205-
<artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
206-
<version>0.1.0</version>
207-
</dependency>
208-
</dependencies>
209-
</plugin>
210-
<!-- Don't deploy the example -->
211-
<plugin>
212-
<groupId>org.apache.maven.plugins</groupId>
213-
<artifactId>maven-deploy-plugin</artifactId>
214-
<configuration>
215-
<skip>true</skip>
216-
</configuration>
217-
</plugin>
218-
</plugins>
219-
>>>>>>>> main:examples/powertools-examples-core/cdk/app/pom.xml
220134
</build>
221135
<profiles>
222136
<!-- Use a profile to enforce AspectJ version 1.9.7 if we are Java 1.8 otherwise we'll get class

‎examples/powertools-examples-core-utilities/serverless/src/main/java/helloworld/App.java

-18
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@
4545
*/
4646
public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
4747
private final static Logger log = LogManager.getLogger(App.class);
48-
49-
// This is controlled by POWERTOOLS_LOGGER_SAMPLE_RATE environment variable
50-
// @Logging(logEvent = true, samplingRate = 0.7)
51-
// This is controlled by POWERTOOLS_METRICS_NAMESPACE environment variable
52-
// @Metrics(namespace = "ServerlessAirline", service = "payment", captureColdStart = true)
53-
// This is controlled by POWERTOOLS_TRACER_CAPTURE_ERROR environment variable
5448
@Tracing(captureMode = CaptureMode.RESPONSE_AND_ERROR)
5549
public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent input, final Context context) {
5650
Map<String, String> headers = new HashMap<>();
@@ -87,25 +81,13 @@ public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEv
8781
return response
8882
.withStatusCode(200)
8983
.withBody(output);
90-
<<<<<<<< HEAD:examples/powertools-examples-core-utilities/cdk/app/src/main/java/helloworld/App.java
91-
} catch (IOException e) {
92-
========
9384
} catch (RuntimeException | IOException e) {
94-
>>>>>>>> main:examples/powertools-examples-core/serverless/src/main/java/helloworld/App.java
9585
return response
9686
.withBody("{}")
9787
.withStatusCode(500);
9888
}
9989
}
10090

101-
<<<<<<<< HEAD:examples/powertools-examples-core-utilities/cdk/app/src/main/java/helloworld/App.java
102-
@Tracing
103-
private void log() {
104-
log.info("inside threaded logging for function");
105-
}
106-
107-
========
108-
>>>>>>>> main:examples/powertools-examples-core/serverless/src/main/java/helloworld/App.java
10991
@Tracing(namespace = "getPageContents", captureMode = CaptureMode.DISABLED)
11092
private String getPageContents(String address) throws IOException {
11193
URL url = new URL(address);

‎examples/powertools-examples-idempotency/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<log4j.version>2.20.0</log4j.version>
2727
<maven.compiler.source>1.8</maven.compiler.source>
2828
<maven.compiler.target>1.8</maven.compiler.target>
29+
<aspectj.version>1.9.20</aspectj.version>
2930
</properties>
3031

3132
<dependencies>

‎examples/powertools-examples-parameters/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<properties>
1111
<maven.compiler.source>1.8</maven.compiler.source>
1212
<maven.compiler.target>1.8</maven.compiler.target>
13+
<aspectj.version>1.9.20</aspectj.version>
1314
</properties>
1415

1516
<dependencies>

‎examples/powertools-examples-validation/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<properties>
2525
<maven.compiler.source>1.8</maven.compiler.source>
2626
<maven.compiler.target>1.8</maven.compiler.target>
27+
<aspectj.version>1.9.20</aspectj.version>
2728
</properties>
2829

2930
<dependencies>

0 commit comments

Comments
 (0)