fix: modify version range for archetypes and samples to avoid 2.x release is picked up for 1.x

deki · deki · commit 911d0f0aa972 · 2024-01-21T11:17:27.000+01:00
diff --git a/aws-serverless-jersey-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-jersey-archetype/src/main/resources/archetype-resources/build.gradle
@@ -7,7 +7,7 @@ repositories {
 
 dependencies {
   implementation (
-          'com.amazonaws.serverless:aws-serverless-java-container-jersey:[1.9,)',
+          'com.amazonaws.serverless:aws-serverless-java-container-jersey:[1.9,2.0)',
           'com.fasterxml.jackson.core:jackson-databind:2.15.0',
           'io.symphonia:lambda-logging:1.0.3'
   )
diff --git a/aws-serverless-spark-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-spark-archetype/src/main/resources/archetype-resources/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
   implementation (
           'com.sparkjava:spark-core:2.9.4',
-          'com.amazonaws.serverless:aws-serverless-java-container-spark:[1.0,)',
+          'com.amazonaws.serverless:aws-serverless-java-container-spark:[1.9,2.0)',
           'com.fasterxml.jackson.core:jackson-databind:2.15.0',
           'io.symphonia:lambda-logging:1.0.3'
   )
diff --git a/aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle
@@ -9,7 +9,7 @@ dependencies {
   implementation (
           'org.springframework:spring-webmvc:5.3.31',
           'org.springframework:spring-context:5.3.31',
-          'com.amazonaws.serverless:aws-serverless-java-container-spring:[1.0,)',
+          'com.amazonaws.serverless:aws-serverless-java-container-spring:[1.9,2.0)',
           'org.apache.logging.log4j:log4j-core:2.19.0',
           'org.apache.logging.log4j:log4j-api:2.19.0',
           'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0',
diff --git a/aws-serverless-springboot2-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-springboot2-archetype/src/main/resources/archetype-resources/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
   implementation (
           'org.springframework.boot:spring-boot-starter-web:2.7.18',
-          'com.amazonaws.serverless:aws-serverless-java-container-springboot2:[1.0,)',
+          'com.amazonaws.serverless:aws-serverless-java-container-springboot2:[1.9,2.0)',
           'io.symphonia:lambda-logging:1.0.3'
   )
 
diff --git a/aws-serverless-struts-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-struts-archetype/src/main/resources/archetype-resources/build.gradle
@@ -13,7 +13,7 @@ configurations {
 
 dependencies {
 
-  implementation ('com.amazonaws.serverless:aws-serverless-java-container-struts:[1.0,)') {
+  implementation ('com.amazonaws.serverless:aws-serverless-java-container-struts:[1.9,2.0)') {
     exclude group: 'org.apache.struts', module: 'struts2-core'
     exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
     exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j'
diff --git a/samples/jersey/pet-store/build.gradle b/samples/jersey/pet-store/build.gradle
@@ -7,7 +7,7 @@ repositories {
 
 dependencies {
   implementation (
-          'com.amazonaws.serverless:aws-serverless-java-container-jersey:[1.9,)',
+          'com.amazonaws.serverless:aws-serverless-java-container-jersey:[1.9,2.0)',
           'com.fasterxml.jackson.core:jackson-databind:2.15.0',
           'io.symphonia:lambda-logging:1.0.3'
   )
diff --git a/samples/jersey/pet-store/pom.xml b/samples/jersey/pet-store/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-jersey</artifactId>
-            <version>[1.9,)</version>
+            <version>[1.9,2.0)</version>
         </dependency>
 
         <dependency>
diff --git a/samples/spark/pet-store/build.gradle b/samples/spark/pet-store/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
   implementation (
           'com.sparkjava:spark-core:2.9.4',
-          'com.amazonaws.serverless:aws-serverless-java-container-spark:[1.0,)',
+          'com.amazonaws.serverless:aws-serverless-java-container-spark:[1.9,2.0)',
           'com.fasterxml.jackson.core:jackson-databind:2.15.0',
           'io.symphonia:lambda-logging:1.0.3'
   )
diff --git a/samples/spark/pet-store/pom.xml b/samples/spark/pet-store/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-spark</artifactId>
-            <version>[1.6,)</version>
+            <version>[1.9,2.0)</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.sparkjava/spark-core -->
diff --git a/samples/spring/pet-store/build.gradle b/samples/spring/pet-store/build.gradle
@@ -9,7 +9,7 @@ dependencies {
   implementation (
           'org.springframework:spring-webmvc:5.3.31',
           'org.springframework:spring-context:5.3.31',
-          'com.amazonaws.serverless:aws-serverless-java-container-spring:[1.0,)',
+          'com.amazonaws.serverless:aws-serverless-java-container-spring:[1.9,2.0)',
           'org.apache.logging.log4j:log4j-core:2.19.0',
           'org.apache.logging.log4j:log4j-api:2.19.0',
           'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0',
diff --git a/samples/spring/pet-store/pom.xml b/samples/spring/pet-store/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-spring</artifactId>
-            <version>[1.9,)</version>
+            <version>[1.9,2.0)</version>
         </dependency>
 
         <dependency>
diff --git a/samples/springboot2/pet-store/pom.xml b/samples/springboot2/pet-store/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-springboot2</artifactId>
-            <version>[1.6,)</version>
+            <version>[1.9,2.0)</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/io.symphonia/lambda-logging -->
diff --git a/samples/struts/pet-store/build.gradle b/samples/struts/pet-store/build.gradle
@@ -13,7 +13,7 @@ configurations {
 
 dependencies {
   implementation (
-          'com.amazonaws.serverless:aws-serverless-java-container-struts:[1.9,)',
+          'com.amazonaws.serverless:aws-serverless-java-container-struts:[1.9,2.0)',
           'org.apache.struts:struts2-convention-plugin:6.3.0.2',
           'org.apache.struts:struts2-rest-plugin:6.3.0.2',
           'org.apache.struts:struts2-bean-validation-plugin:6.3.0.2',
diff --git a/samples/struts/pet-store/pom.xml b/samples/struts/pet-store/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-struts</artifactId>
-            <version>[1.9,)</version>
+            <version>[1.9,2.0)</version>
         </dependency>
 
         <dependency>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ repositories {`
`7`	`7`
`8`	`8`	`dependencies {`
`9`	`9`	`implementation (`
`10`		`- 'com.amazonaws.serverless:aws-serverless-java-container-jersey:[1.9,)',`
	`10`	`+ 'com.amazonaws.serverless:aws-serverless-java-container-jersey:[1.9,2.0)',`
`11`	`11`	`'com.fasterxml.jackson.core:jackson-databind:2.15.0',`
`12`	`12`	`'io.symphonia:lambda-logging:1.0.3'`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ repositories {`
`8`	`8`	`dependencies {`
`9`	`9`	`implementation (`
`10`	`10`	`'com.sparkjava:spark-core:2.9.4',`
`11`		`- 'com.amazonaws.serverless:aws-serverless-java-container-spark:[1.0,)',`
	`11`	`+ 'com.amazonaws.serverless:aws-serverless-java-container-spark:[1.9,2.0)',`
`12`	`12`	`'com.fasterxml.jackson.core:jackson-databind:2.15.0',`
`13`	`13`	`'io.symphonia:lambda-logging:1.0.3'`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ repositories {`
`9`	`9`	`dependencies {`
`10`	`10`	`implementation (`
`11`	`11`	`'org.springframework.boot:spring-boot-starter-web:2.7.18',`
`12`		`- 'com.amazonaws.serverless:aws-serverless-java-container-springboot2:[1.0,)',`
	`12`	`+ 'com.amazonaws.serverless:aws-serverless-java-container-springboot2:[1.9,2.0)',`
`13`	`13`	`'io.symphonia:lambda-logging:1.0.3'`
`14`	`14`	`)`
`15`	`15`