Skip to content

Commit 84d84e7

Browse files
dekideki
committed
Use latest versions of Spring, Spring Security, Spring Boot and Micronaut
1 parent 2aaa322 commit 84d84e7

File tree

14 files changed

+32
-27
lines changed

14 files changed

+32
-27
lines changed

‎.github/workflows/continuous-integration-workflow.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ jobs:
5353
# Spring core 5.2 and above. SpringBoot 1.5 is deprecated
5454
run: ./gha_build.sh spring true true -Djacoco.minCoverage=0.4
5555
- name: Build Spring 4.3
56-
run: ./gha_build.sh spring false false -Dspring.version=4.3.29.RELEASE -Dspring-security.version=4.2.18.RELEASE
56+
run: ./gha_build.sh spring false false -Dspring.version=4.3.30.RELEASE -Dspring-security.version=4.2.20.RELEASE
5757
- name: Build Spring 5.0
58-
run: ./gha_build.sh spring false false -Dspring.version=5.0.19.RELEASE -Dspring-security.version=5.0.18.RELEASE
58+
run: ./gha_build.sh spring false false -Dspring.version=5.0.20.RELEASE -Dspring-security.version=5.0.19.RELEASE
5959
- name: Build Spring 5.1
60-
run: ./gha_build.sh spring false false -Dspring.version=5.1.18.RELEASE -Dspring-security.version=5.1.12.RELEASE
60+
run: ./gha_build.sh spring false false -Dspring.version=5.1.20.RELEASE -Dspring-security.version=5.1.13.RELEASE
61+
- name: Build Spring 5.2
62+
run: ./gha_build.sh spring false false -Dspring.version=5.2.16.RELEASE -Dspring-security.version=5.2.11.RELEASE
6163

6264
build_springboot2:
6365
name: Build and test SpringBoot 2
@@ -66,10 +68,13 @@ jobs:
6668
- uses: actions/checkout@v2
6769
- name: Build latest
6870
run: ./gha_build.sh springboot2 true true
69-
- name: Build Spring Boot 2.0
70-
run: ./gha_build.sh springboot2 false false -Dspringboot.version=2.0.9.RELEASE -Dspring.version=5.0.19.RELEASE -Dspringsecurity.version=5.0.18.RELEASE
71-
- name: Build Spring Boot 2.1
72-
run: ./gha_build.sh springboot2 false false -Dspringboot.version=2.1.17.RELEASE -Dspring.version=5.1.18.RELEASE -Dspringsecurity.version=5.1.12.RELEASE
71+
# https://github.com/spring-projects/spring-boot/wiki/Supported-Versions
72+
- name: Build Spring Boot 2.2
73+
run: ./gha_build.sh springboot2 false false -Dspringboot.version=2.2.13.RELEASE -Dspring.version=5.2.12.RELEASE -Dspringsecurity.version=5.2.8.RELEASE
74+
- name: Build Spring Boot 2.3
75+
run: ./gha_build.sh springboot2 false false -Dspringboot.version=2.3.12.RELEASE -Dspring.version=5.2.15.RELEASE -Dspringsecurity.version=5.3.9
76+
- name: Build Spring Boot 2.4
77+
run: ./gha_build.sh springboot2 false false -Dspringboot.version=2.4.9 -Dspring.version=5.3.9 -Dspringsecurity.version=5.4.7
7378

7479
build_struts2:
7580
name: Build and test Struts 2

‎aws-serverless-java-container-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>org.springframework.security</groupId>
9898
<artifactId>spring-security-web</artifactId>
99-
<version>5.2.11.RELEASE</version>
99+
<version>5.5.1</version>
100100
<scope>test</scope>
101101
</dependency>
102102
</dependencies>

‎aws-serverless-java-container-spring/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
</parent>
1717

1818
<properties>
19-
<spring.version>5.2.16.RELEASE</spring.version>
20-
<spring-security.version>5.2.11.RELEASE</spring-security.version>
19+
<spring.version>5.3.9</spring.version>
20+
<spring-security.version>5.5.1</spring-security.version>
2121
</properties>
2222

2323
<dependencies>

‎aws-serverless-java-container-springboot2/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<version>1.6-SNAPSHOT</version>
1616

1717
<properties>
18-
<spring.version>5.2.16.RELEASE</spring.version>
19-
<springboot.version>2.2.13.RELEASE</springboot.version>
20-
<springsecurity.version>5.2.11.RELEASE</springsecurity.version>
18+
<spring.version>5.3.9</spring.version>
19+
<springboot.version>2.5.3</springboot.version>
20+
<springsecurity.version>5.5.1</springsecurity.version>
2121
<maven.compiler.source>1.8</maven.compiler.source>
2222
<maven.compiler.target>1.8</maven.compiler.target>
2323
</properties>

‎aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ repositories {
77

88
dependencies {
99
implementation (
10-
'org.springframework:spring-webmvc:5.2.16.RELEASE',
11-
'org.springframework:spring-context:5.2.16.RELEASE',
10+
'org.springframework:spring-webmvc:5.3.9',
11+
'org.springframework:spring-context:5.3.9',
1212
'com.amazonaws.serverless:aws-serverless-java-container-spring:[1.0,)',
1313
'org.apache.logging.log4j:log4j-core:2.14.1',
1414
'org.apache.logging.log4j:log4j-api:2.14.1',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<maven.compiler.source>1.8</maven.compiler.source>
1818
<maven.compiler.target>1.8</maven.compiler.target>
19-
<spring.version>5.2.16.RELEASE</spring.version>
19+
<spring.version>5.3.9</spring.version>
2020
<junit.version>4.12</junit.version>
2121
<log4j.version>2.14.1</log4j.version>
2222
</properties>

‎aws-serverless-springboot2-archetype/src/main/resources/archetype-resources/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repositories {
88

99
dependencies {
1010
implementation (
11-
'org.springframework.boot:spring-boot-starter-web:2.2.6.RELEASE',
11+
'org.springframework.boot:spring-boot-starter-web:2.5.3',
1212
'com.amazonaws.serverless:aws-serverless-java-container-springboot2:[1.0,)',
1313
'io.symphonia:lambda-logging:1.0.1'
1414
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.springframework.boot</groupId>
1818
<artifactId>spring-boot-starter-parent</artifactId>
19-
<version>2.2.6.RELEASE</version>
19+
<version>2.5.3</version>
2020
</parent>
2121

2222
<properties>

‎samples/micronaut/pet-store/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id "com.github.johnrengelman.shadow" version "5.0.0"
44
id "application"
55
id "net.ltgt.apt-eclipse" version "0.21"
6-
id "org.springframework.boot" version "2.1.12.RELEASE"
6+
id "org.springframework.boot" version "2.5.3"
77
id "io.spring.dependency-management" version "1.0.6.RELEASE"
88
}
99

@@ -53,8 +53,8 @@ dependencies {
5353

5454
// spring support
5555
implementation("org.springframework.boot:spring-boot-starter-web")
56-
runtime("io.micronaut.spring:micronaut-spring-boot:1.0.1")
57-
runtime("io.micronaut.spring:micronaut-spring-web:1.0.1")
56+
runtime("io.micronaut.spring:micronaut-spring-boot:4.0.0-RC2")
57+
runtime("io.micronaut.spring:micronaut-spring-web:4.0.0-RC2")
5858
}
5959

6060
test.classpath += configurations.developmentOnly

‎samples/micronaut/pet-store/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
micronautVersion=1.2.3
1+
micronautVersion=2.5.9

0 commit comments

Comments
 (0)