Skip to content

Commit

Permalink
update to java 21 & spring boot 3.2.1 && spring-cloud 2023.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wlanboy committed Jan 4, 2024
1 parent 56e69e4 commit 58b0432
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dockerpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 17
java-version: 21
- name: Build with Maven
run: mvn -B package --file pom.xml -DskipTests=true
- name: Publish to Registry
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 17
java-version: 21
- name: Build with Maven
run: mvn -B package -DskipTests --file pom.xml
10 changes: 4 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.6</version>
<version>3.2.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
<java.version>21</java.version>
<!-- https://mvnrepository.com/artifact/org.webjars/webjars-locator -->
<webjars-locator.version>0.46</webjars-locator.version>
<webjars-locator.version>0.50</webjars-locator.version>
<!-- https://mvnrepository.com/artifact/org.webjars/bootstrap -->
<bootstrap.version>4.6.2</bootstrap.version>
<bootstrap.version>5.3.2</bootstrap.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -95,8 +95,6 @@
<additionalProperties>
<encoding.source>UTF-8</encoding.source>
<encoding.reporting>UTF-8</encoding.reporting>
<java.source>${maven.compiler.source}</java.source>
<java.target>${maven.compiler.target}</java.target>
</additionalProperties>
</configuration>
</execution>
Expand Down

0 comments on commit 58b0432

Please # to comment.