Skip to content

Commit 52c4cf7

Browse files
stevehouelPankaj Agrawal
stevehouel
authored and
Pankaj Agrawal
committed
refactor: using parent revision as basis for versioning
1 parent 5c36d90 commit 52c4cf7

6 files changed

Lines changed: 222 additions & 311 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,5 @@ docs/node_modules
9797
docs/.cache
9898
docs/public
9999
/example/.aws-sam/
100-
/example/HelloWorldFunction/.aws-sam/
100+
/example/HelloWorldFunction/.aws-sam/
101+
.flattened-pom.xml

‎pom.xml‎

Lines changed: 214 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,9 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<artifactId>powertools-parent</artifactId>
9-
<groupId>software.amazon.lambda</groupId>
10-
<version>0.1.0-SNAPSHOT</version>
11-
<relativePath>powertools-parent/pom.xml</relativePath>
12-
</parent>
13-
14-
<artifactId>powertools</artifactId>
15-
<version>0.1.0-SNAPSHOT</version>
7+
<groupId>software.amazon.lambda</groupId>
8+
<artifactId>powertools-parent</artifactId>
9+
<version>${revision}</version>
1610
<packaging>pom</packaging>
1711

1812
<name>AWS Lambda Powertools Java library Parent</name>
@@ -33,7 +27,6 @@
3327
</licenses>
3428

3529
<modules>
36-
<module>powertools-parent</module>
3730
<module>powertools-core</module>
3831
<module>powertools-logging</module>
3932
<module>powertools-tracing</module>
@@ -51,4 +44,215 @@
5144
</developer>
5245
</developers>
5346

47+
<properties>
48+
<revision>0.1.0-SNAPSHOT</revision>
49+
<maven.compiler.source>1.8</maven.compiler.source>
50+
<maven.compiler.target>1.8</maven.compiler.target>
51+
<log4j.version>2.13.3</log4j.version>
52+
<jackson.version>2.11.0</jackson.version>
53+
<aspectj.version>1.9.6</aspectj.version>
54+
<aws.xray.recorder.version>2.4.0</aws.xray.recorder.version>
55+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
56+
<lambda.core.version>1.2.1</lambda.core.version>
57+
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
58+
<aspectj-maven-plugin.version>1.12.1</aspectj-maven-plugin.version>
59+
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
60+
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
61+
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
62+
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
63+
<maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
64+
<maven-source-plugin.version>2.4</maven-source-plugin.version>
65+
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
66+
</properties>
67+
68+
<distributionManagement>
69+
<snapshotRepository>
70+
<id>ossrh</id>
71+
<url>https://aws.oss.sonatype.org/content/repositories/snapshots</url>
72+
</snapshotRepository>
73+
</distributionManagement>
74+
75+
<dependencyManagement>
76+
<dependencies>
77+
<dependency>
78+
<groupId>software.amazon.lambda</groupId>
79+
<artifactId>powertools-core</artifactId>
80+
<version>${project.version}</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>com.amazonaws</groupId>
84+
<artifactId>aws-lambda-java-core</artifactId>
85+
<version>${lambda.core.version}</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.aspectj</groupId>
89+
<artifactId>aspectjrt</artifactId>
90+
<version>${aspectj.version}</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>com.fasterxml.jackson.core</groupId>
94+
<artifactId>jackson-databind</artifactId>
95+
<version>${jackson.version}</version>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.apache.logging.log4j</groupId>
99+
<artifactId>log4j-core</artifactId>
100+
<version>${log4j.version}</version>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.apache.logging.log4j</groupId>
104+
<artifactId>log4j-api</artifactId>
105+
<version>${log4j.version}</version>
106+
</dependency>
107+
<dependency>
108+
<groupId>com.amazonaws</groupId>
109+
<artifactId>aws-xray-recorder-sdk-core</artifactId>
110+
<version>${aws.xray.recorder.version}</version>
111+
</dependency>
112+
<dependency>
113+
<groupId>com.amazonaws</groupId>
114+
<artifactId>aws-xray-recorder-sdk-aws-sdk</artifactId>
115+
<version>${aws.xray.recorder.version}</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>com.amazonaws</groupId>
119+
<artifactId>aws-xray-recorder-sdk-aws-sdk-instrumentor</artifactId>
120+
<version>${aws.xray.recorder.version}</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>com.amazonaws</groupId>
124+
<artifactId>aws-xray-recorder-sdk-aws-sdk-v2</artifactId>
125+
<version>${aws.xray.recorder.version}</version>
126+
</dependency>
127+
<dependency>
128+
<groupId>com.amazonaws</groupId>
129+
<artifactId>aws-xray-recorder-sdk-aws-sdk-v2-instrumentor</artifactId>
130+
<version>${aws.xray.recorder.version}</version>
131+
</dependency>
132+
133+
<!-- Test dependencies -->
134+
<dependency>
135+
<groupId>org.junit.jupiter</groupId>
136+
<artifactId>junit-jupiter-api</artifactId>
137+
<version>5.6.2</version>
138+
<scope>test</scope>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.junit.jupiter</groupId>
142+
<artifactId>junit-jupiter-engine</artifactId>
143+
<version>5.6.2</version>
144+
<scope>test</scope>
145+
</dependency>
146+
<dependency>
147+
<groupId>org.apache.commons</groupId>
148+
<artifactId>commons-lang3</artifactId>
149+
<version>3.11</version>
150+
<scope>test</scope>
151+
</dependency>
152+
<dependency>
153+
<groupId>org.mockito</groupId>
154+
<artifactId>mockito-core</artifactId>
155+
<version>3.3.3</version>
156+
<scope>test</scope>
157+
</dependency>
158+
<dependency>
159+
<groupId>org.aspectj</groupId>
160+
<artifactId>aspectjweaver</artifactId>
161+
<version>${aspectj.version}</version>
162+
<scope>test</scope>
163+
</dependency>
164+
<dependency>
165+
<groupId>org.assertj</groupId>
166+
<artifactId>assertj-core</artifactId>
167+
<version>3.9.1</version>
168+
<scope>test</scope>
169+
</dependency>
170+
<dependency>
171+
<groupId>org.aspectj</groupId>
172+
<artifactId>aspectjtools</artifactId>
173+
<version>${aspectj.version}</version>
174+
</dependency>
175+
</dependencies>
176+
</dependencyManagement>
177+
178+
<build>
179+
<pluginManagement>
180+
<plugins>
181+
<plugin>
182+
<groupId>org.apache.maven.plugins</groupId>
183+
<artifactId>maven-compiler-plugin</artifactId>
184+
<version>${maven-compiler-plugin.version}</version>
185+
</plugin>
186+
<plugin>
187+
<!-- We can use official one after https://github.com/mojohaus/aspectj-maven-plugin/pull/45 -->
188+
<groupId>com.nickwongdev</groupId>
189+
<artifactId>aspectj-maven-plugin</artifactId>
190+
<version>${aspectj-maven-plugin.version}</version>
191+
</plugin>
192+
<plugin>
193+
<groupId>org.apache.maven.plugins</groupId>
194+
<artifactId>maven-surefire-plugin</artifactId>
195+
<version>${maven-surefire-plugin.version}</version>
196+
</plugin>
197+
<plugin>
198+
<groupId>org.jacoco</groupId>
199+
<artifactId>jacoco-maven-plugin</artifactId>
200+
<version>${jacoco-maven-plugin.version}</version>
201+
</plugin>
202+
<plugin>
203+
<groupId>org.codehaus.mojo</groupId>
204+
<artifactId>cobertura-maven-plugin</artifactId>
205+
<version>${cobertura-maven-plugin.version}</version>
206+
</plugin>
207+
<plugin>
208+
<groupId>org.sonatype.plugins</groupId>
209+
<artifactId>nexus-staging-maven-plugin</artifactId>
210+
<version>${nexus-staging-maven-plugin.version}</version>
211+
</plugin>
212+
<plugin>
213+
<groupId>org.apache.maven.plugins</groupId>
214+
<artifactId>maven-source-plugin</artifactId>
215+
<version>${maven-source-plugin.version}</version>
216+
</plugin>
217+
<plugin>
218+
<groupId>org.apache.maven.plugins</groupId>
219+
<artifactId>maven-javadoc-plugin</artifactId>
220+
<version>${maven-javadoc-plugin.version}</version>
221+
</plugin>
222+
<plugin>
223+
<groupId>org.apache.maven.plugins</groupId>
224+
<artifactId>maven-gpg-plugin</artifactId>
225+
<version>${maven-gpg-plugin.version}</version>
226+
</plugin>
227+
</plugins>
228+
</pluginManagement>
229+
<plugins>
230+
<plugin>
231+
<groupId>org.codehaus.mojo</groupId>
232+
<artifactId>flatten-maven-plugin</artifactId>
233+
<version>1.1.0</version>
234+
<configuration>
235+
<updatePomFile>true</updatePomFile>
236+
<flattenMode>resolveCiFriendliesOnly</flattenMode>
237+
</configuration>
238+
<executions>
239+
<execution>
240+
<id>flatten</id>
241+
<phase>process-resources</phase>
242+
<goals>
243+
<goal>flatten</goal>
244+
</goals>
245+
</execution>
246+
<execution>
247+
<id>flatten.clean</id>
248+
<phase>clean</phase>
249+
<goals>
250+
<goal>clean</goal>
251+
</goals>
252+
</execution>
253+
</executions>
254+
</plugin>
255+
</plugins>
256+
</build>
257+
54258
</project>

‎powertools-core/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<artifactId>powertools-core</artifactId>
8-
<version>0.1.0-SNAPSHOT</version>
98
<packaging>jar</packaging>
109

1110
<parent>
1211
<artifactId>powertools-parent</artifactId>
1312
<groupId>software.amazon.lambda</groupId>
14-
<version>0.1.0-SNAPSHOT</version>
15-
<relativePath>../powertools-parent/pom.xml</relativePath>
13+
<version>${revision}</version>
14+
<relativePath>../pom.xml</relativePath>
1615
</parent>
1716

1817
<name>AWS Lambda Powertools Java library Core</name>

‎powertools-logging/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<artifactId>powertools-logging</artifactId>
8-
<version>0.1.0-SNAPSHOT</version>
98
<packaging>jar</packaging>
109

1110
<parent>
1211
<artifactId>powertools-parent</artifactId>
1312
<groupId>software.amazon.lambda</groupId>
14-
<version>0.1.0-SNAPSHOT</version>
15-
<relativePath>../powertools-parent/pom.xml</relativePath>
13+
<version>${revision}</version>
14+
<relativePath>../pom.xml</relativePath>
1615
</parent>
1716

1817
<name>AWS Lambda Powertools Java library Logging</name>

0 commit comments

Comments
 (0)