Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Springboot3 master #783

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/linux_unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ on:
branches: [ master ]

jobs:
unit_test_for_jdk8:
unit_test_for_jdk17:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 8
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: '8'
java-version: '17'
distribution: 'adopt-hotspot'
cache: 'maven'
- name: Test with Maven
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@ jobs:
#
# steps:
# - uses: actions/checkout@v3
# - name: Set up JDK 8
# - name: Set up JDK 17
# uses: actions/setup-java@v3
# with:
# java-version: '8'
# java-version: '17'
# distribution: 'temurin'
# cache: maven
# - name: Build with Maven
# run: mvn clean install -DskipTests -B -U -e && sh ./check_format.sh
release_for_jdk8:
release_for_jdk17:
# needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'temurin'
cache: maven
server-id: ossrh
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@ jobs:
#
# steps:
# - uses: actions/checkout@v3
# - name: Set up JDK 8
# - name: Set up JDK 17
# uses: actions/setup-java@v3
# with:
# java-version: '8'
# java-version: '17'
# distribution: 'temurin'
# cache: maven
# - name: Build with Maven
# run: mvn clean install -DskipTests -B -U -e && sh ./check_format.sh
snapshot_for_jdk8:
snapshot_for_jdk17:
# needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'temurin'
cache: maven
server-id: ossrh
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows_unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ on:
branches: [ "master" ]

jobs:
unit_test_for_jdk8:
unit_test_for_jdk17:
runs-on: windows-latest
strategy:
fail-fast: true
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'adopt-hotspot'
cache: maven
- name: Build with Maven
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
</modules>

<properties>
<sofa.ark.version>2.2.4</sofa.ark.version>
<sofa.ark.version>3.0.0</sofa.ark.version>
<project.encoding>UTF-8</project.encoding>
<java.version>1.8</java.version>
<java.version>17</java.version>
<license.maven.plugin>3.0</license.maven.plugin>
<maven.java.formatter.plugin>0.4</maven.java.formatter.plugin>
<maven.compiler.plugin>3.1</maven.compiler.plugin>
Expand Down
2 changes: 1 addition & 1 deletion sofa-ark-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<maven.plugin.plugin>3.6.1</maven.plugin.plugin>
<surefire.version>2.22.2</surefire.version>
<netty.version>4.1.90.Final</netty.version>
<spring.boot.version>2.7.14</spring.boot.version>
<spring.boot.version>3.0.9</spring.boot.version>
</properties>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>

<properties>
<spring.boot.version>2.7.14</spring.boot.version>
<spring.boot.version>3.0.9</spring.boot.version>
</properties>

<artifactId>sofa-ark-springboot-starter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import javax.servlet.Servlet;
import jakarta.servlet.Servlet;

/**
* @author qilong.zql
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;

import javax.servlet.ServletContainerInitializer;
import jakarta.servlet.ServletContainerInitializer;
import java.io.File;
import java.net.URL;
import java.nio.charset.Charset;
Expand Down
2 changes: 1 addition & 1 deletion sofa-ark-plugin/web-ark-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<artifactId>web-ark-plugin</artifactId>

<properties>
<spring.boot.version>2.7.14</spring.boot.version>
<spring.boot.version>3.0.9</spring.boot.version>
</properties>

<dependencies>
Expand Down