Skip to content

Commit 841269e

Browse files
committed
cleaning poms
1 parent 4c1b6d2 commit 841269e

File tree

7 files changed

+64
-169
lines changed

7 files changed

+64
-169
lines changed

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
<module>powertools-validation</module>
3838
<module>powertools-test-suite</module>
3939
<module>powertools-cloudformation</module>
40-
<module>powertools-idempotency</module>
40+
<module>powertools-idempotency</module>
41+
<module>powertools-e2e-tests</module>
4142
<module>examples</module>
4243
</modules>
4344

powertools-e2e-tests/handlers/idempotency/pom.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<groupId>software.amazon.lambda</groupId>
1818
<artifactId>powertools-idempotency</artifactId>
1919
</dependency>
20-
<dependency>
21-
<groupId>com.amazonaws</groupId>
22-
<artifactId>aws-lambda-java-core</artifactId>
23-
</dependency>
2420
<dependency>
2521
<groupId>com.amazonaws</groupId>
2622
<artifactId>aws-lambda-java-events</artifactId>
@@ -33,7 +29,6 @@
3329
<plugin>
3430
<groupId>org.codehaus.mojo</groupId>
3531
<artifactId>aspectj-maven-plugin</artifactId>
36-
<version>1.14.0</version>
3732
<configuration>
3833
<source>${maven.compiler.source}</source>
3934
<target>${maven.compiler.target}</target>
@@ -56,42 +51,6 @@
5651
<plugin>
5752
<groupId>org.apache.maven.plugins</groupId>
5853
<artifactId>maven-shade-plugin</artifactId>
59-
<version>3.2.4</version>
60-
<configuration>
61-
<createDependencyReducedPom>false</createDependencyReducedPom>
62-
<finalName>function</finalName>
63-
</configuration>
64-
<executions>
65-
<execution>
66-
<phase>package</phase>
67-
<goals>
68-
<goal>shade</goal>
69-
</goals>
70-
<configuration>
71-
<transformers>
72-
<transformer
73-
implementation="io.github.edwgiz.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer">
74-
</transformer>
75-
</transformers>
76-
</configuration>
77-
</execution>
78-
</executions>
79-
<dependencies>
80-
<dependency>
81-
<groupId>io.github.edwgiz</groupId>
82-
<artifactId>log4j-maven-shade-plugin-extensions</artifactId>
83-
<version>2.17.2</version>
84-
</dependency>
85-
</dependencies>
86-
</plugin>
87-
<plugin>
88-
<groupId>org.apache.maven.plugins</groupId>
89-
<artifactId>maven-compiler-plugin</artifactId>
90-
<version>3.10.1</version>
91-
<configuration>
92-
<source>${maven.compiler.source}</source>
93-
<target>${maven.compiler.target}</target>
94-
</configuration>
9554
</plugin>
9655
</plugins>
9756
</build>

powertools-e2e-tests/handlers/logging/pom.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<groupId>software.amazon.lambda</groupId>
1818
<artifactId>powertools-logging</artifactId>
1919
</dependency>
20-
<dependency>
21-
<groupId>com.amazonaws</groupId>
22-
<artifactId>aws-lambda-java-core</artifactId>
23-
</dependency>
2420
<dependency>
2521
<groupId>com.amazonaws</groupId>
2622
<artifactId>aws-lambda-java-events</artifactId>
@@ -33,7 +29,6 @@
3329
<plugin>
3430
<groupId>org.codehaus.mojo</groupId>
3531
<artifactId>aspectj-maven-plugin</artifactId>
36-
<version>1.14.0</version>
3732
<configuration>
3833
<source>${maven.compiler.source}</source>
3934
<target>${maven.compiler.target}</target>
@@ -56,42 +51,6 @@
5651
<plugin>
5752
<groupId>org.apache.maven.plugins</groupId>
5853
<artifactId>maven-shade-plugin</artifactId>
59-
<version>3.2.4</version>
60-
<configuration>
61-
<createDependencyReducedPom>false</createDependencyReducedPom>
62-
<finalName>function</finalName>
63-
</configuration>
64-
<executions>
65-
<execution>
66-
<phase>package</phase>
67-
<goals>
68-
<goal>shade</goal>
69-
</goals>
70-
<configuration>
71-
<transformers>
72-
<transformer
73-
implementation="io.github.edwgiz.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer">
74-
</transformer>
75-
</transformers>
76-
</configuration>
77-
</execution>
78-
</executions>
79-
<dependencies>
80-
<dependency>
81-
<groupId>io.github.edwgiz</groupId>
82-
<artifactId>log4j-maven-shade-plugin-extensions</artifactId>
83-
<version>2.17.2</version>
84-
</dependency>
85-
</dependencies>
86-
</plugin>
87-
<plugin>
88-
<groupId>org.apache.maven.plugins</groupId>
89-
<artifactId>maven-compiler-plugin</artifactId>
90-
<version>3.10.1</version>
91-
<configuration>
92-
<source>${maven.compiler.source}</source>
93-
<target>${maven.compiler.target}</target>
94-
</configuration>
9554
</plugin>
9655
</plugins>
9756
</build>

powertools-e2e-tests/handlers/metrics/pom.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<groupId>software.amazon.lambda</groupId>
1818
<artifactId>powertools-metrics</artifactId>
1919
</dependency>
20-
<dependency>
21-
<groupId>com.amazonaws</groupId>
22-
<artifactId>aws-lambda-java-core</artifactId>
23-
</dependency>
2420
<dependency>
2521
<groupId>com.amazonaws</groupId>
2622
<artifactId>aws-lambda-java-events</artifactId>
@@ -33,7 +29,6 @@
3329
<plugin>
3430
<groupId>org.codehaus.mojo</groupId>
3531
<artifactId>aspectj-maven-plugin</artifactId>
36-
<version>1.14.0</version>
3732
<configuration>
3833
<source>${maven.compiler.source}</source>
3934
<target>${maven.compiler.target}</target>
@@ -56,42 +51,6 @@
5651
<plugin>
5752
<groupId>org.apache.maven.plugins</groupId>
5853
<artifactId>maven-shade-plugin</artifactId>
59-
<version>3.2.4</version>
60-
<configuration>
61-
<createDependencyReducedPom>false</createDependencyReducedPom>
62-
<finalName>function</finalName>
63-
</configuration>
64-
<executions>
65-
<execution>
66-
<phase>package</phase>
67-
<goals>
68-
<goal>shade</goal>
69-
</goals>
70-
<configuration>
71-
<transformers>
72-
<transformer
73-
implementation="io.github.edwgiz.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer">
74-
</transformer>
75-
</transformers>
76-
</configuration>
77-
</execution>
78-
</executions>
79-
<dependencies>
80-
<dependency>
81-
<groupId>io.github.edwgiz</groupId>
82-
<artifactId>log4j-maven-shade-plugin-extensions</artifactId>
83-
<version>2.17.2</version>
84-
</dependency>
85-
</dependencies>
86-
</plugin>
87-
<plugin>
88-
<groupId>org.apache.maven.plugins</groupId>
89-
<artifactId>maven-compiler-plugin</artifactId>
90-
<version>3.10.1</version>
91-
<configuration>
92-
<source>${maven.compiler.source}</source>
93-
<target>${maven.compiler.target}</target>
94-
</configuration>
9554
</plugin>
9655
</plugins>
9756
</build>

powertools-e2e-tests/handlers/pom.xml

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,16 @@
1010
<description>Fake handlers that use Lambda Powertools for Java.</description>
1111

1212
<properties>
13-
<lambda.powertools.version>1.12.3</lambda.powertools.version>
14-
<lambda.java.core>1.2.1</lambda.java.core>
15-
<lambda.java.events>3.11.0</lambda.java.events>
13+
<lambda.powertools.version>1.14.0</lambda.powertools.version>
1614
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1715
<maven.compiler.source>11</maven.compiler.source>
1816
<maven.compiler.target>11</maven.compiler.target>
17+
18+
<lambda.java.core>1.2.2</lambda.java.core>
19+
<lambda.java.events>3.11.0</lambda.java.events>
20+
<maven.shade.version>3.2.4</maven.shade.version>
21+
<aspectj.version>1.14.0</aspectj.version>
22+
<maven.compiler.version>3.10.1</maven.compiler.version>
1923
</properties>
2024

2125
<modules>
@@ -60,4 +64,56 @@
6064
</dependencies>
6165
</dependencyManagement>
6266

67+
<build>
68+
<pluginManagement>
69+
<plugins>
70+
<plugin>
71+
<groupId>org.apache.maven.plugins</groupId>
72+
<artifactId>maven-shade-plugin</artifactId>
73+
<version>${maven.shade.version}</version>
74+
<configuration>
75+
<createDependencyReducedPom>false</createDependencyReducedPom>
76+
<finalName>function</finalName>
77+
</configuration>
78+
<executions>
79+
<execution>
80+
<phase>package</phase>
81+
<goals>
82+
<goal>shade</goal>
83+
</goals>
84+
<configuration>
85+
<transformers>
86+
<transformer
87+
implementation="io.github.edwgiz.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer">
88+
</transformer>
89+
</transformers>
90+
</configuration>
91+
</execution>
92+
</executions>
93+
<dependencies>
94+
<dependency>
95+
<groupId>io.github.edwgiz</groupId>
96+
<artifactId>log4j-maven-shade-plugin-extensions</artifactId>
97+
<version>2.17.2</version>
98+
</dependency>
99+
</dependencies>
100+
</plugin>
101+
<plugin>
102+
<groupId>org.codehaus.mojo</groupId>
103+
<artifactId>aspectj-maven-plugin</artifactId>
104+
<version>${aspectj.version}</version>
105+
</plugin>
106+
<plugin>
107+
<groupId>org.apache.maven.plugins</groupId>
108+
<artifactId>maven-compiler-plugin</artifactId>
109+
<version>${maven.compiler.version}</version>
110+
<configuration>
111+
<source>${maven.compiler.source}</source>
112+
<target>${maven.compiler.target}</target>
113+
</configuration>
114+
</plugin>
115+
</plugins>
116+
</pluginManagement>
117+
</build>
118+
63119
</project>

powertools-e2e-tests/handlers/tracing/pom.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<groupId>software.amazon.lambda</groupId>
1818
<artifactId>powertools-tracing</artifactId>
1919
</dependency>
20-
<dependency>
21-
<groupId>com.amazonaws</groupId>
22-
<artifactId>aws-lambda-java-core</artifactId>
23-
</dependency>
2420
<dependency>
2521
<groupId>com.amazonaws</groupId>
2622
<artifactId>aws-lambda-java-events</artifactId>
@@ -33,7 +29,6 @@
3329
<plugin>
3430
<groupId>org.codehaus.mojo</groupId>
3531
<artifactId>aspectj-maven-plugin</artifactId>
36-
<version>1.14.0</version>
3732
<configuration>
3833
<source>${maven.compiler.source}</source>
3934
<target>${maven.compiler.target}</target>
@@ -56,42 +51,6 @@
5651
<plugin>
5752
<groupId>org.apache.maven.plugins</groupId>
5853
<artifactId>maven-shade-plugin</artifactId>
59-
<version>3.2.4</version>
60-
<configuration>
61-
<createDependencyReducedPom>false</createDependencyReducedPom>
62-
<finalName>function</finalName>
63-
</configuration>
64-
<executions>
65-
<execution>
66-
<phase>package</phase>
67-
<goals>
68-
<goal>shade</goal>
69-
</goals>
70-
<configuration>
71-
<transformers>
72-
<transformer
73-
implementation="io.github.edwgiz.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer">
74-
</transformer>
75-
</transformers>
76-
</configuration>
77-
</execution>
78-
</executions>
79-
<dependencies>
80-
<dependency>
81-
<groupId>io.github.edwgiz</groupId>
82-
<artifactId>log4j-maven-shade-plugin-extensions</artifactId>
83-
<version>2.17.2</version>
84-
</dependency>
85-
</dependencies>
86-
</plugin>
87-
<plugin>
88-
<groupId>org.apache.maven.plugins</groupId>
89-
<artifactId>maven-compiler-plugin</artifactId>
90-
<version>3.10.1</version>
91-
<configuration>
92-
<source>${maven.compiler.source}</source>
93-
<target>${maven.compiler.target}</target>
94-
</configuration>
9554
</plugin>
9655
</plugins>
9756
</build>

powertools-e2e-tests/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
<parent>
77
<artifactId>powertools-parent</artifactId>
88
<groupId>software.amazon.lambda</groupId>
9-
<version>1.12.3</version>
9+
<version>1.14.0</version>
1010
</parent>
1111

1212
<artifactId>powertools-e2e-tests</artifactId>
13+
<name>AWS Lambda Powertools for Java library End-to-end tests</name>
1314
<description>AWS Lambda Powertools for Java End-To-End Tests</description>
1415

1516
<properties>
17+
<!-- we can use Java 11 for integration tests, not forced to stick to Java 8 -->
1618
<maven.compiler.source>11</maven.compiler.source>
1719
<maven.compiler.target>11</maven.compiler.target>
1820
<constructs.version>10.1.138</constructs.version>

0 commit comments

Comments
 (0)