Merge pull request #54 from komamitsu/support-v3

Support tests using Spring Boot 3

Author: komamitsu

.github/workflows/ci.yml

@@ -10,67 +10,86 @@ on:
 jobs:
  build:
  runs-on: ubuntu-latest
- strategy:
- matrix:
- java_version: [11, 17]
  steps:
- - uses: actions/checkout@v3
- - name: Set up JDK ${{ matrix.java_version }}
- uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - name: Set up JDK 11
+ uses: actions/setup-java@v4
  with:
  distribution: temurin
- java-version: ${{ matrix.java_version }}
- - name: Setup and execute Gradle 'check' task
- uses: gradle/gradle-build-action@v2
-  with:
-  arguments: check
+ java-version: 11
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@v4
+ - name: Execute Gradle 'check' task
+ run: ./gradlew check
  - name: Upload Gradle test reports
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: gradle_test_reports
  path: build/reports/tests/test
 
  integration-test:
  runs-on: ubuntu-latest
- strategy:
- matrix:
- java_version: [11, 17]
  steps:
- - uses: actions/checkout@v3
- - name: Set up JDK ${{ matrix.java_version }}
- uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - name: Set up JDK 11
+ uses: actions/setup-java@v4
  with:
  distribution: temurin
- java-version: ${{ matrix.java_version }}
- - name: Setup and execute Gradle 'integrationTest' task
- uses: gradle/gradle-build-action@v2
-  with:
-  arguments: integrationTest
+ java-version: 11
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@v4
+ - name: Execute Gradle 'integrationTest' task
+ run: ./gradlew integrationTest
  - name: Upload Gradle test reports
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: gradle_integration_test_reports
  path: build/reports/tests/integrationTest
 
- test-on-example-app:
+ test-on-example-app-with-spring-boot-2:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ - name: Set up JDK 11
+ uses: actions/setup-java@v4
+ with:
+ distribution: temurin
+ java-version: 11
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@v4
+ - name: Install spring-data-sqlite to Maven local
+ run: ./gradlew publishToMavenLocal
+ - name: Execute the example app using Spring Boot 2 to test spring-data-sqlite
+ working-directory: example
+ env:
+ WITH_SPRING_BOOT_2: true
+ run: ./gradlew run
+
+ test-on-example-app-with-spring-boot-3:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- java_version: [11, 17]
+ java_version: [17, 21]
  steps:
- - uses: actions/checkout@v3
- - name: Set up JDK ${{ matrix.java_version }}
- uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
+ - name: Set up JDK 11 to install spring-data-sqlite for `publishToMavenLocal`
+ uses: actions/setup-java@v4
  with:
  distribution: temurin
- java-version: ${{ matrix.java_version }}
+ java-version: 11
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@v4
  - name: Install spring-data-sqlite to Maven local
- uses: gradle/gradle-build-action@v2
+ run: ./gradlew publishToMavenLocal
+ - name: Set up JDK ${{ matrix.java_version }} for testing
+ uses: actions/setup-java@v4
  with:
- arguments: publishToMavenLocal
- - name: Execute the example app to test spring-data-sqlite
- uses: gradle/gradle-build-action@v2
- with:
- build-root-directory: example
- arguments: run
-
+ distribution: temurin
+ java-version: ${{ matrix.java_version }}
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@v4
+ - name: Execute the example app using Spring Boot 3 to test spring-data-sqlite
+ working-directory: example
+ env:
+ WITH_SPRING_BOOT_2: false
+ run: ./gradlew run

build.gradle

@@ -5,7 +5,7 @@ plugins {
  id "com.diffplug.spotless" version "6.25.0"
 }
 
-project.version = '1.2.0'
+project.version = '1.3.0'
 group = "org.komamitsu"
 
 repositories {
@@ -120,7 +120,7 @@ spotless {
  java {
  importOrder()
  removeUnusedImports()
- googleJavaFormat('1.19.1')
+ googleJavaFormat()
  formatAnnotations()
  }
 }

example/build.gradle

@@ -1,13 +1,20 @@
 plugins {
  id 'java-library'
  id 'application'
- id "com.diffplug.spotless" version "6.12.1"
+ id "com.diffplug.spotless" version "6.25.0"
 }
 
 group 'org.komamitsu'
 version '1.0-SNAPSHOT'
 
 def springDataSqliteVersion = getSpringDataSqliteVersion()
+def withSpringBoot2 = System.getenv('WITH_SPRING_BOOT_2')?.toBoolean() ?: false
+if (withSpringBoot2) {
+ println("Testing with Spring Boot 2")
+}
+else {
+ println("Testing with Spring Boot 3")
+}
 
 repositories {
  mavenCentral()
@@ -16,14 +23,37 @@ repositories {
 
 dependencies {
  implementation "org.komamitsu:spring-data-sqlite:${springDataSqliteVersion}"
- implementation 'org.springframework.boot:spring-boot-starter:2.7.6'
- implementation 'org.springframework.boot:spring-boot-starter-aop:2.7.6'
+ if (withSpringBoot2) {
+ implementation platform('org.springframework.boot:spring-boot-dependencies:2.7.18')
+ } else {
+ implementation platform('org.springframework.boot:spring-boot-dependencies:3.3.5')
+ }
+ implementation 'org.springframework.boot:spring-boot-starter'
+ implementation 'org.springframework.boot:spring-boot-starter-aop'
  implementation 'org.springframework.retry:spring-retry:1.3.4'
  implementation 'com.zaxxer:HikariCP:4.0.3'
+ implementation('org.slf4j:slf4j-api') {
+ if (withSpringBoot2) {
+ version {
+ // This version of spring-boot-starter-logging uses logback-classic:1.2.x.
+ // But Spring Data JDBC for SQLite uses slf4j-api:2.x and Spring logging doesn't work.
+ // So we specify a proper version here.
+ strictly '1.7.36'
+ }
+ }
+ }
  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }
 
+compileJava {
+ if (!withSpringBoot2) {
+ // This is needed only for Spring Boot 3.
+ // It will be not needed later https://stackoverflow.com/questions/78374721/spring-data-jdbc-repository-bean-creation-error/78376635#comment138178415_78376635.
+ options.compilerArgs << '-parameters'
+ }
+}
+
 test {
  useJUnitPlatform()
 }
@@ -36,7 +66,7 @@ spotless {
  java {
  importOrder()
  removeUnusedImports()
- googleJavaFormat('1.7')
+ googleJavaFormat()
  formatAnnotations()
  }
 }

example/gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

example/gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 # Darwin, MinGW, and NonStop.
 #
 # (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 # within the Gradle project.
 #
 # You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
  esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
  fi
 else
  JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+ fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
  case $MAX_FD in #(
  max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
  MAX_FD=$( ulimit -H -n ) ||
  warn "Could not query maximum file descriptor limit"
  esac
  case $MAX_FD in #(
  '' | soft) :;; #(
  *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
  ulimit -n "$MAX_FD" ||
  warn "Could not set maximum file descriptor limit to $MAX_FD"
  esac
@@ -193,18 +201,28 @@ if "$cygwin" || "$msys" ; then
  done
 fi
 
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
 
 set -- \
  "-Dorg.gradle.appname=$APP_BASE_NAME" \
  -classpath "$CLASSPATH" \
  org.gradle.wrapper.GradleWrapperMain \
  "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.