Skip to content

Commit 074f9dc

Browse files
sapessisapessi
committed
Parametrized depedency version in the archetype to pick up the project one. Also added base integration tests to address #178 
1 parent 25ef434 commit 074f9dc

File tree

22 files changed

+302
-35
lines changed

22 files changed

+302
-35
lines changed

‎aws-serverless-jersey-archetype/pom.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,23 @@
2525
</licenses>
2626

2727
<build>
28+
<resources>
29+
<resource>
30+
<directory>src/main/resources</directory>
31+
<filtering>true</filtering>
32+
<includes>
33+
<include>archetype-resources/pom.xml</include>
34+
</includes>
35+
</resource>
36+
<resource>
37+
<directory>src/main/resources</directory>
38+
<filtering>false</filtering>
39+
<excludes>
40+
<exclude>archetype-resources/pom.xml</exclude>
41+
</excludes>
42+
</resource>
43+
</resources>
44+
2845
<extensions>
2946
<extension>
3047
<groupId>org.apache.maven.archetype</groupId>
@@ -35,10 +52,25 @@
3552

3653
<pluginManagement>
3754
<plugins>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-resources-plugin</artifactId>
58+
<version>3.1.0</version>
59+
<configuration>
60+
<escapeString>\</escapeString>
61+
</configuration>
62+
</plugin>
3863
<plugin>
3964
<groupId>org.apache.maven.plugins</groupId>
4065
<artifactId>maven-archetype-plugin</artifactId>
4166
<version>3.0.1</version>
67+
<executions>
68+
<execution>
69+
<goals>
70+
<goal>integration-test</goal>
71+
</goals>
72+
</execution>
73+
</executions>
4274
</plugin>
4375
</plugins>
4476
</pluginManagement>

‎aws-serverless-jersey-archetype/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>${groupId}</groupId>
6-
<artifactId>${artifactId}</artifactId>
7-
<version>${version}</version>
5+
<groupId>\${groupId}</groupId>
6+
<artifactId>\${artifactId}</artifactId>
7+
<version>\${version}</version>
88
<packaging>jar</packaging>
99

1010
<name>Serverless Jersey API</name>
@@ -14,13 +14,14 @@
1414
<maven.compiler.source>1.8</maven.compiler.source>
1515
<maven.compiler.target>1.8</maven.compiler.target>
1616
<jersey.version>2.27</jersey.version>
17+
<jackson.version>2.9.7</jackson.version>
1718
</properties>
1819

1920
<dependencies>
2021
<dependency>
2122
<groupId>com.amazonaws.serverless</groupId>
2223
<artifactId>aws-serverless-java-container-jersey</artifactId>
23-
<version>1.2</version>
24+
<version>${project.version}</version>
2425
</dependency>
2526

2627
<dependency>
@@ -46,27 +47,14 @@
4647
<dependency>
4748
<groupId>com.fasterxml.jackson.core</groupId>
4849
<artifactId>jackson-databind</artifactId>
49-
<version>2.9.7</version>
50+
<version>${jackson.version}</version>
5051
</dependency>
5152

5253
<dependency>
5354
<groupId>org.glassfish.jersey.inject</groupId>
5455
<artifactId>jersey-hk2</artifactId>
5556
<version>${jersey.version}</version>
5657
<!-- excluding redundant javax.inject dependency -->
57-
<exclusions>
58-
<exclusion>
59-
<groupId>org.glassfish.hk2</groupId>
60-
<artifactId>hk2-api</artifactId>
61-
</exclusion>
62-
</exclusions>
63-
</dependency>
64-
65-
<dependency>
66-
<groupId>org.glassfish.hk2</groupId>
67-
<artifactId>hk2-api</artifactId>
68-
<version>2.5.0-b42</version>
69-
<!-- excluding redundant javax.inject dependency -->
7058
<exclusions>
7159
<exclusion>
7260
<groupId>javax.inject</groupId>

‎aws-serverless-jersey-archetype/src/test/resources/projects/base/archetype.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
groupId=test.service
2+
artifactId=jersey-archetype-test
3+
version=1.0-SNAPSHOT

‎aws-serverless-jersey-archetype/src/test/resources/projects/base/goal.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package

‎aws-serverless-spark-archetype/pom.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,23 @@
2525
</licenses>
2626

2727
<build>
28+
<resources>
29+
<resource>
30+
<directory>src/main/resources</directory>
31+
<filtering>true</filtering>
32+
<includes>
33+
<include>archetype-resources/pom.xml</include>
34+
</includes>
35+
</resource>
36+
<resource>
37+
<directory>src/main/resources</directory>
38+
<filtering>false</filtering>
39+
<excludes>
40+
<exclude>archetype-resources/pom.xml</exclude>
41+
</excludes>
42+
</resource>
43+
</resources>
44+
2845
<extensions>
2946
<extension>
3047
<groupId>org.apache.maven.archetype</groupId>
@@ -35,10 +52,26 @@
3552

3653
<pluginManagement>
3754
<plugins>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-resources-plugin</artifactId>
58+
<version>3.1.0</version>
59+
<configuration>
60+
<escapeString>\</escapeString>
61+
</configuration>
62+
</plugin>
63+
3864
<plugin>
3965
<groupId>org.apache.maven.plugins</groupId>
4066
<artifactId>maven-archetype-plugin</artifactId>
4167
<version>3.0.1</version>
68+
<executions>
69+
<execution>
70+
<goals>
71+
<goal>integration-test</goal>
72+
</goals>
73+
</execution>
74+
</executions>
4275
</plugin>
4376
</plugins>
4477
</pluginManagement>

‎aws-serverless-spark-archetype/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +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-
<groupId>${groupId}</groupId>
8-
<artifactId>${artifactId}</artifactId>
9-
<version>${version}</version>
7+
<groupId>\${groupId}</groupId>
8+
<artifactId>\${artifactId}</artifactId>
9+
<version>\${version}</version>
1010
<packaging>jar</packaging>
1111

1212
<name>Serverless Spark API</name>
@@ -15,15 +15,15 @@
1515
<properties>
1616
<maven.compiler.source>1.8</maven.compiler.source>
1717
<maven.compiler.target>1.8</maven.compiler.target>
18-
<jackson.version>2.9.5</jackson.version>
18+
<jackson.version>2.9.7</jackson.version>
1919
<spark.version>2.8.0</spark.version>
2020
</properties>
2121

2222
<dependencies>
2323
<dependency>
2424
<groupId>com.amazonaws.serverless</groupId>
2525
<artifactId>aws-serverless-java-container-spark</artifactId>
26-
<version>1.2</version>
26+
<version>${project.version}</version>
2727
</dependency>
2828

2929
<dependency>

‎aws-serverless-spark-archetype/src/test/resources/projects/base/archetype.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
groupId=test.service
2+
artifactId=spark-archetype-test
3+
version=1.0-SNAPSHOT

‎aws-serverless-spark-archetype/src/test/resources/projects/base/goal.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package

‎aws-serverless-spring-archetype/pom.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,23 @@
2525
</licenses>
2626

2727
<build>
28+
<resources>
29+
<resource>
30+
<directory>src/main/resources</directory>
31+
<filtering>true</filtering>
32+
<includes>
33+
<include>archetype-resources/pom.xml</include>
34+
</includes>
35+
</resource>
36+
<resource>
37+
<directory>src/main/resources</directory>
38+
<filtering>false</filtering>
39+
<excludes>
40+
<exclude>archetype-resources/pom.xml</exclude>
41+
</excludes>
42+
</resource>
43+
</resources>
44+
2845
<extensions>
2946
<extension>
3047
<groupId>org.apache.maven.archetype</groupId>
@@ -35,10 +52,26 @@
3552

3653
<pluginManagement>
3754
<plugins>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-resources-plugin</artifactId>
58+
<version>3.1.0</version>
59+
<configuration>
60+
<escapeString>\</escapeString>
61+
</configuration>
62+
</plugin>
63+
3864
<plugin>
3965
<groupId>org.apache.maven.plugins</groupId>
4066
<artifactId>maven-archetype-plugin</artifactId>
4167
<version>3.0.1</version>
68+
<executions>
69+
<execution>
70+
<goals>
71+
<goal>integration-test</goal>
72+
</goals>
73+
</execution>
74+
</executions>
4275
</plugin>
4376
</plugins>
4477
</pluginManagement>

‎aws-serverless-spring-archetype/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +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-
<groupId>${groupId}</groupId>
8-
<artifactId>${artifactId}</artifactId>
9-
<version>${version}</version>
7+
<groupId>\${groupId}</groupId>
8+
<artifactId>\${artifactId}</artifactId>
9+
<version>\${version}</version>
1010
<packaging>jar</packaging>
1111

1212
<name>Serverless Spring API</name>
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>com.amazonaws.serverless</groupId>
2626
<artifactId>aws-serverless-java-container-spring</artifactId>
27-
<version>1.2</version>
27+
<version>${project.version}</version>
2828
</dependency>
2929

3030
<dependency>

0 commit comments

Comments
 (0)