feat: add support for Java 17 and Spring 6, restructure project (#264)

- Add support for Java 17 and Spring Framework 6
- Restructure project into a multi-module Maven project
- Move smoke tests into their own module, `smoke-tests` for testing compatibility with different Java versions
- Update README with compatibility notes

Author: f-lopes

.github/workflows/build.yml

@@ -8,13 +8,52 @@ on:
     branches: [ main ]
 
 jobs:
+
   build:
-    name: "Build with ${{ matrix.java }}"
+    name: "Main build"
+
+    runs-on: ubuntu-latest
+    outputs:
+      candidate_version_revision: ${{ steps.candidate_version.outputs.candidate_version_revision }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup java
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'temurin'
+
+      - name: Cache local Maven repository
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Retrieve current version
+        id: current_version
+        run: echo "project_version=$(mvn help:evaluate -Dexpression=project.version -Dchangelist= -q -DforceStdout)" >> "$GITHUB_OUTPUT"
+
+      - name: Compute release candidate revision version
+        id: candidate_version
+        run: echo "candidate_version_revision=${{ steps.current_version.outputs.project_version }}.$GITHUB_RUN_ID" >> "$GITHUB_OUTPUT"
+
+      - name: Build candidate version
+        run: mvn -B -pl '!smoke-tests' clean install -Drevision=${{ steps.candidate_version.outputs.candidate_version_revision }} -Dchangelist=-rc
+
+  smoke-tests:
+    name: "Run smoke tests with Java ${{ matrix.java }} for spring-mvc-test-utils ${{ needs.build.outputs.candidate_version_revision }}-rc version"
     strategy:
       matrix:
-        java: [ 11, 17 ]
+        java: [ 17, 21 ]
 
     runs-on: ubuntu-latest
+    needs: build
+    env:
+      candidate_version_revision: ${{ needs.build.outputs.candidate_version_revision }}
 
     steps:
       - uses: actions/checkout@v4
@@ -24,7 +63,14 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
-          cache: 'maven'
 
-      - name: Build with Maven
-        run: mvn -B verify
+      - name: Cache local Maven repository
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Run smoke tests with Java ${{ matrix.java }} for spring-mvc-test-utils ${{ needs.build.outputs.candidate_version_revision }}-rc version
+        run: mvn -B -pl 'smoke-tests' -Dspring-mvc-test-utils.version=${candidate_version_revision}-rc -Djava.version=${{ matrix.java }} clean verify

README.md

@@ -4,7 +4,7 @@
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.florianlopes/spring-mvc-test-utils/badge.svg)](https://search.maven.org/#artifactdetails%7Cio.florianlopes%7Cspring-mvc-test-utils%7C3.2.0%7Cjar)
 [![Build Status](https://travis-ci.org/f-lopes/spring-mvc-test-utils.svg?branch=develop)](https://travis-ci.org/f-lopes/spring-mvc-test-utils)
-[![codecov](https://codecov.io/gh/f-lopes/spring-mvc-test-utils/branch/master/graph/badge.svg?token=2yY70RB1tw)](https://codecov.io/gh/f-lopes/spring-mvc-test-utils)
+[![codecov](https://codecov.io/gh/f-lopes/spring-mvc-test-utils/branch/main/graph/badge.svg?token=2yY70RB1tw)](https://codecov.io/gh/f-lopes/spring-mvc-test-utils)
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/1e521e339dc446328b7ccc52faaa7648)](https://www.codacy.com/app/f-lopes/spring-mvc-test-utils?utm_source=github.com&utm_medium=referral&utm_content=f-lopes/spring-mvc-test-utils&utm_campaign=badger)
 [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/f-lopes/spring-mvc-test-utils.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/f-lopes/spring-mvc-test-utils/context:java)
@@ -28,7 +28,13 @@ Add this dependency to your `pom.xml` file:
 </dependency>
 ```
 
-**Note:** since version `3.0.0`, `Java 8` is no longer supported, `Java 11` is the minimum supported version.
+_**Note:** since version `4.0.0`, `Java 11` is no longer supported, `Java 17` is the minimum supported version._
+
+_This library is tested with Spring Framework `6.1.12` along with Java `17` and `21` (
+see [smoke-tests](https://github.com/f-lopes/spring-mvc-test-utils/tree/main/smoke-tests/src/tests/java/io/florianlopes/spring/test/web/servlet/request/MockMvcRequestBuilderUtilsSmokeTests.java)
+and [build.yml](https://github.com/f-lopes/spring-mvc-test-utils/blob/main/.github/workflows/build.yml#L15) workflow)_
+
+---
 
 ```MockMvcRequestBuilderUtils.postForm("/url", formObject);```
 
@@ -73,7 +79,8 @@ mockMvc.perform(put("/users").with(MockMvcRequestBuilderUtils.form(addUserForm))
 
 ### Register property editor(s)
 
-This tool relies on default Spring's property editors (see https://github.com/spring-projects/spring-framework/blob/master/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java#L200).
+This tool relies on default Spring's property editors (
+see https://github.com/spring-projects/spring-framework/blob/main/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java#L200).
 
 If you want to override one of those registered by default, simple use the `MockMvcRequestBuilderUtils.registerPropertyEditor(...)` method:
 ```
@@ -120,9 +127,9 @@ Feel free to contribute using this guide:
     ```git branch -b my-feature```
 5. Commit your changes (and squash them if necessary using `git rebase -i` or `git add -p`)
 6. Pull the latest changes from the original repository
-    ```git checkout master && git pull --rebase upstream master```
-7. Rebase master branch with your feature
-    ```git checkout my-feature && git rebase master```
+   ```git checkout main && git pull --rebase upstream main```
+7. Rebase main branch with your feature
+   ```git checkout my-feature && git rebase main```
     Solve any existing conflicts
 8. Push your changes and create a PR on GitHub
     ```git push -u origin my-feature```