Skip to content

Commit 17434e0

Browse files
muhamadtomuhamadto
authored
27 add spring 3 support (#44)
* Spring 3 and java 20 Signed-off-by: muhamadto <muhamadto@gmail.com>
1 parent c37de57 commit 17434e0

File tree

17 files changed

+136
-173
lines changed

17 files changed

+136
-173
lines changed

‎.dockerignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ PULL_REQUEST_TEMPLATE.md
1111
README.md
1212
**/*.iml
1313

14-
# Settings.xml file is already in the ghcr.io/muhamadto/spring-native-aws-lambda-builder-java17 image and
15-
# there is no need to copy it again if you want to use your own setting file, you can comment the
16-
# line below
1714
settings-spring.xml
1815

1916
spring-native-aws-lambda-infra

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,27 @@ on:
1919
push:
2020
branches: [ "*" ]
2121
pull_request:
22-
branches: [ "java17", "java11" ]
22+
branches: [ "main" ]
2323
types: [ opened, synchronize, reopened ]
2424

2525
jobs:
2626
build:
2727
runs-on: ubuntu-latest
2828
strategy:
29+
matrix:
30+
java-version: [ '20' ]
31+
graalvm-version: [ '20.0.2' ]
32+
distribution: [ 'graalvm' ]
2933
fail-fast: true
3034
steps:
3135
- name: Checkout repository
3236
uses: actions/checkout@v3
3337
- name: Setup Java
34-
uses: actions/setup-java@v3
38+
uses: graalvm/setup-graalvm@v1
3539
with:
36-
distribution: 'adopt'
37-
java-version: '17'
40+
distribution: '${{ matrix.distribution }}'
41+
version: '${{ matrix.graalvm-version }}'
42+
java-version: '${{ matrix.java-version }}'
3843
cache: 'maven'
3944
- name: Cache Sonar packages
4045
uses: actions/cache@v3
@@ -52,4 +57,4 @@ jobs:
5257
env:
5358
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5459
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
55-
run: mvn --no-transfer-progress clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=muhamadto_spring-native-aws-lambda --settings settings-spring.xml
60+
run: mvn --no-transfer-progress clean verify -Pnative org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=muhamadto_spring-native-aws-lambda

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
push:
2020
branches: [ "*" ]
2121
pull_request:
22-
branches: [ "java17", "java11" ]
22+
branches: [ "main" ]
2323
types: [ opened, synchronize, reopened ]
2424

2525
jobs:
@@ -31,41 +31,24 @@ jobs:
3131
contents: read
3232
security-events: write
3333
strategy:
34-
fail-fast: false
3534
matrix:
35+
java-version: [ '20' ]
36+
distribution: [ 'temurin' ]
3637
language: [ 'java' ]
38+
fail-fast: true
3739
steps:
3840
- name: Checkout repository
3941
uses: actions/checkout@v3
4042
- name: Setup Java
4143
uses: actions/setup-java@v3
4244
with:
43-
distribution: 'adopt'
44-
java-version: '17'
45+
distribution: '${{ matrix.distribution }}'
46+
java-version: '${{ matrix.java-version }}'
4547
cache: 'maven'
4648
- name: Initialize CodeQL
4749
uses: github/codeql-action/init@v2
4850
with:
4951
languages: ${{ matrix.language }}
50-
- name: maven-settings-xml-action
51-
uses: whelk-io/maven-settings-xml-action@v18
52-
with:
53-
repositories: >
54-
[
55-
{
56-
"id": "spring-releases",
57-
"name": "Spring Releases",
58-
"url": "https://repo.spring.io/release"
59-
}
60-
]
61-
plugin_repositories: >
62-
[
63-
{
64-
"id": "spring-releases",
65-
"name": "Spring Releases",
66-
"url": "https://repo.spring.io/release"
67-
}
68-
]
6952
- name: Autobuild
7053
uses: github/codeql-action/autobuild@v2
7154
- name: Perform CodeQL Analysis

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
release:
2525
runs-on: ubuntu-latest
2626
container:
27-
image: ghcr.io/muhamadto/spring-native-amazonlinux2-base:17-amazonlinux2
27+
image: ghcr.io/muhamadto/spring-native-amazonlinux2-base:20-amazonlinux2
2828
options: --user=worker:ci
2929
permissions:
3030
id-token: write

‎README.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@
1313

1414
| Component | Version |
1515
|---------------|----------|
16-
| JDK | 17 |
17-
| GraalVM | 22.2 |
18-
| Spring Native | 0.12.1 |
19-
| Spring Cloud | 2021.0.3 |
20-
| Spring Boot | 2.7.5 |
21-
| AWS CDK | 2.40.0 |
16+
| JDK | 20 |
17+
| Spring Cloud | 2022.0.1 |
18+
| Spring Boot | 3.1.2 |
2219

2320
## Test
2421

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.9'
22
services:
33
spring-native-aws-lambda-function:
4-
image: ghcr.io/muhamadto/spring-native-amazonlinux2-base:17-amazonlinux2
4+
image: ghcr.io/muhamadto/spring-native-amazonlinux2-builder:20-amazonlinux2
55
ports:
66
- 8080:8080
77
networks:

‎pom.xml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@
3939
</developers>
4040

4141
<properties>
42-
<java.version>17</java.version>
42+
<maven.compiler.source>20</maven.compiler.source>
43+
<maven.compiler.target>20</maven.compiler.target>
44+
<maven.compiler.release>20</maven.compiler.release>
45+
4346
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4447
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4548
<sonar.organization>muhamadto</sonar.organization>
@@ -61,20 +64,25 @@
6164
${project.basedir}/target/site/jacoco-it/jacoco.xml
6265
</sonar.coverage.jacoco.xmlReportPaths>
6366
<sonar.coverage.exclusions>**/model/*.java, **/Application.java,
64-
**/SpringNativeAwsLambdaApplication.java
67+
**/SpringNativeAwsLambdaApplication.java,**/*Hints.java,
68+
**/*Application.java
6569
</sonar.coverage.exclusions>
66-
<maven.compiler.source>17</maven.compiler.source>
67-
<maven.compiler.target>17</maven.compiler.target>
68-
<maven.compiler.release>17</maven.compiler.release>
6970
<maven.compiler.parameters>true</maven.compiler.parameters>
7071
<assertj-core.version>3.23.1</assertj-core.version>
7172
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
7273
<sonar.organization>muhamadto</sonar.organization>
7374
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
7475
<revision>1.0.0-SNAPSHOT</revision>
7576
<jackson.version>2.13.0</jackson.version>
77+
<spring-boot-dependencies.version>3.1.2</spring-boot-dependencies.version>
7678
</properties>
7779

80+
<parent>
81+
<groupId>org.springframework.boot</groupId>
82+
<artifactId>spring-boot-starter-parent</artifactId>
83+
<version>3.1.2</version>
84+
</parent>
85+
7886
<modules>
7987
<module>spring-native-aws-lambda-function</module>
8088
<module>spring-native-aws-lambda-infra</module>
@@ -191,12 +199,12 @@
191199
<plugin>
192200
<groupId>org.apache.maven.plugins</groupId>
193201
<artifactId>maven-compiler-plugin</artifactId>
194-
<version>3.10.1</version>
202+
<version>3.11.0</version>
195203
</plugin>
196204
<plugin>
197205
<groupId>org.jacoco</groupId>
198206
<artifactId>jacoco-maven-plugin</artifactId>
199-
<version>0.8.8</version>
207+
<version>0.8.10</version>
200208
<executions>
201209
<execution>
202210
<id>pre-unit-test</id>

‎settings-spring.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@
1919
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
2020
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
22-
<profiles>
23-
<profile>
24-
<id>spring</id>
25-
<repositories>
26-
<repository>
27-
<id>spring-releases</id>
28-
<name>Spring Releases</name>
29-
<url>https://repo.spring.io/release</url>
30-
</repository>
31-
</repositories>
22+
<!-- <profiles>-->
23+
<!-- <profile>-->
24+
<!-- <id>spring</id>-->
25+
<!-- <repositories>-->
26+
<!-- <repository>-->
27+
<!-- <id>spring-releases</id>-->
28+
<!-- <name>Spring Releases</name>-->
29+
<!-- <url>https://repo.spring.io/release</url>-->
30+
<!-- </repository>-->
31+
<!-- </repositories>-->
3232

33-
<pluginRepositories>
34-
<pluginRepository>
35-
<id>spring-releases</id>
36-
<name>Spring Releases</name>
37-
<url>https://repo.spring.io/release</url>
38-
</pluginRepository>
39-
</pluginRepositories>
40-
</profile>
41-
</profiles>
42-
<activeProfiles>
43-
<activeProfile>spring</activeProfile>
44-
</activeProfiles>
33+
<!-- <pluginRepositories>-->
34+
<!-- <pluginRepository>-->
35+
<!-- <id>spring-releases</id>-->
36+
<!-- <name>Spring Releases</name>-->
37+
<!-- <url>https://repo.spring.io/release</url>-->
38+
<!-- </pluginRepository>-->
39+
<!-- </pluginRepositories>-->
40+
<!-- </profile>-->
41+
<!-- </profiles>-->
42+
<!-- <activeProfiles>-->
43+
<!-- <activeProfile>spring</activeProfile>-->
44+
<!-- </activeProfiles>-->
4545
</settings>

0 commit comments

Comments
 (0)