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.

Sign up for GitHub

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

Jump to bottom

Upgrade to Spring 6.0 #26

Closed
wants to merge 1 commit into from
Closed

Upgrade to Spring 6.0 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/mvn-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "CI - JDK 11 Build"
name: "CI - JDK 17 Build"

on:
push:
Expand All @@ -9,16 +9,16 @@ on:

jobs:
build-jdk11:
name: "JDK 11 Build"
name: "JDK 17 Build"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Build
run: mvn clean install

4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>io.quarkus</groupId>
<artifactId>quarkus-spring-api</artifactId>
<version>5.2.SP8-SNAPSHOT</version>
<version>6.0.Final-SNAPSHOT</version>

<name>Spring dependencies for Quarkus Spring DI extension</name>
<description>The minimum dependencies to reduce the footprint of Quarkus applications using the Spring DI extension</description>
Expand Down Expand Up @@ -41,7 +41,7 @@
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<spring-framework.version>5.2.20.RELEASE</spring-framework.version>
<spring-framework.version>6.0.7</spring-framework.version>
</properties>

<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions quarkus-spring-beans-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

<groupId>io.quarkus</groupId>
<artifactId>quarkus-spring-beans-api</artifactId>
<version>5.2.SP8-SNAPSHOT</version>
<version>6.0.Final-SNAPSHOT</version>

<parent>
<artifactId>quarkus-spring-api</artifactId>
<groupId>io.quarkus</groupId>
<version>5.2.SP8-SNAPSHOT</version>
<version>6.0.Final-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions quarkus-spring-context-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<artifactId>quarkus-spring-api</artifactId>
<groupId>io.quarkus</groupId>
<version>5.2.SP8-SNAPSHOT</version>
<version>6.0.Final-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<groupId>io.quarkus</groupId>
<artifactId>quarkus-spring-context-api</artifactId>
<version>5.2.SP8-SNAPSHOT</version>
<version>6.0.Final-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down
5 changes: 3 additions & 2 deletions quarkus-spring-core-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<artifactId>quarkus-spring-api</artifactId>
<groupId>io.quarkus</groupId>
<version>5.2.SP8-SNAPSHOT</version>
<version>6.0.Final-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<groupId>io.quarkus</groupId>
<artifactId>quarkus-spring-core-api</artifactId>
<version>5.2.SP8-SNAPSHOT</version>
<version>6.0.Final-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down Expand Up @@ -58,6 +58,7 @@
<include>org/springframework/util/Assert**</include>
<include>org/springframework/util/ClassUtils**</include>
<include>org/springframework/util/CollectionUtils**</include>
<include>org/springframework/util/ConcurrentLruCache**</include>
<include>org/springframework/util/ConcurrentReferenceHashMap**</include>
<include>org/springframework/util/LinkedMultiValueMap**</include>
<include>org/springframework/util/MultiValueMap**</include>
Expand Down
7 changes: 5 additions & 2 deletions quarkus-spring-web-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-spring-api</artifactId>
<version>5.2.SP8-SNAPSHOT</version>
<version>6.0.Final-SNAPSHOT</version>
</parent>

<groupId>io.quarkus</groupId>
<artifactId>quarkus-spring-web-api</artifactId>
<version>5.2.SP8-SNAPSHOT</version>
<version>6.0.Final-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down Expand Up @@ -76,6 +76,7 @@
<include>org/springframework/http/HttpOutputMessage**</include>
<include>org/springframework/http/HttpRange**</include>
<include>org/springframework/http/InvalidMediaTypeException**</include>
<include>org/springframework/http/ProblemDetail**</include>
<include>org/springframework/http/ReadOnlyHttpHeaders**</include>
<include>org/springframework/http/RequestEntity**</include>
<include>org/springframework/http/MediaType**</include>
Expand All @@ -86,6 +87,8 @@
</include>
<include>org/springframework/http/converter/HttpMessageNotWritableException**
</include>
<include>org/springframework/web/ErrorResponse**</include>
<include>org/springframework/web/ErrorResponseException**</include>
<include>org/springframework/web/WebApplicationInitializer**</include>
<include>org/springframework/web/bind/annotation/ControllerAdvice**</include>
<include>org/springframework/web/bind/annotation/RequestMethod**</include>
Expand Down
4 changes: 2 additions & 2 deletions quarkus-spring-webmvc-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-spring-api</artifactId>
<version>5.2.SP8-SNAPSHOT</version>
<version>6.0.Final-SNAPSHOT</version>
</parent>

<groupId>io.quarkus</groupId>
<artifactId>quarkus-spring-webmvc-api</artifactId>
<version>5.2.SP8-SNAPSHOT</version>
<version>6.0.Final-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down