Merge tag '2.3.9' into release/backfill

.github/dependabot.yml

@@ -4,6 +4,9 @@ updates:
   directory: "/"
   schedule:
     interval: daily
-    time: "19:00"
-  open-pull-requests-limit: 10
+  target-branch: "2.x"
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
   target-branch: "2.x"

.github/workflows/build-and-test.yml

@@ -1,29 +1,34 @@
 name: Build and Test
 
-on: push
+on: [ push, pull_request ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: 11
-        cache: gradle
-    - name: Build with Gradle
-      uses: gradle/gradle-build-action@v2
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@v3
+    - name: ⚙️ Run build
+      run: ./gradlew build --no-daemon --scan
+    - name: Publish Test Report
+      uses: mikepenz/action-junit-report@v4
+      if: always()
       with:
-        arguments: build --no-daemon --scan
-    - name: Create test summary
+        report_paths: '**/build/test-results/*/*.xml'
+        require_tests: true
+    - name: Create Test Summary
       uses: test-summary/action@v2
       with:
         paths: '**/build/test-results/*/*.xml'
       if: always()
     - name: Code Coverage
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/release.yml

@@ -12,20 +12,21 @@ jobs:
       && !contains(toJSON(github.event.commits.*.message), '[skip release]')
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 11
-          cache: gradle
-      - name: Release with Gradle
-        run: |
-          echo "sonatypeUsername=$SONATYPE_USERNAME" >> gradle.properties
-          echo "sonatypePassword=$SONATYPE_PASSWORD" >> gradle.properties
-          ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
-        env:
-          GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
-          GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
-          SONATYPE_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+    - uses: actions/checkout@v4
+    - name: Set up JDK 11
+      uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 11
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@v3
+    - name: 🚀 Run release
+      run: |
+        echo "sonatypeUsername=$SONATYPE_USERNAME" >> gradle.properties
+        echo "sonatypePassword=$SONATYPE_PASSWORD" >> gradle.properties
+        ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+      env:
+        GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+        GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+        SONATYPE_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+        SONATYPE_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

README.md

@@ -1,6 +1,6 @@
 # XPath-to-XML
-[![Build Status](https://github.com/SimY4/xpath-to-xml/workflows/Build%20and%20Test/badge.svg?branch=java6)](https://github.com/SimY4/xpath-to-xml/actions?query=workflow%3A"Build+and+Test")
-[![codecov](https://codecov.io/gh/SimY4/xpath-to-xml/branch/master/graph/badge.svg)](https://codecov.io/gh/SimY4/xpath-to-xml)
+[![Build Status](https://github.com/SimY4/xpath-to-xml/workflows/Build%20and%20Test/badge.svg?branch=2.x)](https://github.com/SimY4/xpath-to-xml/actions?query=workflow%3A"Build+and+Test")
+[![codecov](https://codecov.io/gh/SimY4/xpath-to-xml/branch/2.x/graph/badge.svg)](https://codecov.io/gh/SimY4/xpath-to-xml)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.simy4.xpath/xpath-to-xml-core.svg)](https://search.maven.org/search?q=g:com.github.simy4.xpath)

build.gradle

@@ -1,8 +1,8 @@
 plugins {
-    id 'com.diffplug.spotless' version '6.18.0' apply false
-    id 'info.solidsoft.pitest' version '1.9.11' apply false
+    id 'com.diffplug.spotless' version '6.25.0' apply false
+    id 'info.solidsoft.pitest' version '1.15.0' apply false
     id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
-    id 'me.champeau.jmh' version '0.7.1' apply false
+    id 'me.champeau.jmh' version '0.7.2' apply false
     id 'net.ltgt.errorprone' version '3.1.0' apply false
     id 'net.researchgate.release' version '3.0.2'
     id 'org.beryx.jar' version '2.0.0' apply false
@@ -17,16 +17,16 @@ subprojects {
     apply from: rootProject.file('gradle/publish-jar.gradle')
     apply from: rootProject.file('gradle/publish-maven.gradle')
 
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
-
     repositories {
         mavenCentral()
     }
 
     java {
         withJavadocJar()
         withSourcesJar()
+
+        sourceCompatibility = JavaVersion.VERSION_1_6
+        targetCompatibility = JavaVersion.VERSION_1_6
     }
 
     // after gradle 5.3 we need to set this attribute to mark test configuration targeting java 8
@@ -58,6 +58,7 @@ subprojects {
         useJUnitPlatform()
 
         reports {
+            html.required = project.hasProperty('reports')
             junitXml.required = true
         }
     }
@@ -85,5 +86,5 @@ release {
 }
 
 wrapper {
-    gradleVersion = '8.1.1'
+    gradleVersion = '8.6'
 }

gradle.properties

@@ -1,5 +1,5 @@
 group = com.github.simy4.xpath
-version = 2.3.8
+version = 2.3.9
 
 projectDescription = Convenient utility to build XML models by evaluating XPath expressions
 projectUrl = https://github.com/SimY4/xpath-to-xml

gradle/benchmark-jmh.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'me.champeau.jmh'
 
 jmh {
-    jmhVersion = '1.36'
+    jmhVersion = '1.37'
 }
 
 // after gradle 5.3 we need to set this attribute to mark test configuration targeting java 8

gradle/check-codecoverage.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'jacoco'
 
 jacoco {
-    toolVersion = '0.8.9'
+    toolVersion = '0.8.10'
 }
 
 jacocoTestReport {
     afterEvaluate {
         reports {
             xml.required = true
-            html.required = true
+            html.required = project.hasProperty('reports')
             html.outputLocation = layout.buildDirectory.dir("jacocoHtml")
         }
     }

gradle/check-mutationcoverage.gradle

@@ -1,13 +1,14 @@
 apply plugin: 'info.solidsoft.pitest'
 
 pitest {
-    junit5PluginVersion = '1.1.2'
-    pitestVersion = '1.14.0'
+    junit5PluginVersion = '1.2.0'
+    pitestVersion = '1.15.0'
     targetClasses = ['com.github.simy4.xpath.*']
     threads = 4
-    outputFormats = ['XML', 'HTML']
+    outputFormats = project.hasProperty('reports') ? ['HTML'] : ['XML']
     mutationThreshold = 80
     coverageThreshold = 80
+    verbosity = 'QUIET'
 }
 
-check.dependsOn 'pitest'
+check.dependsOn 'pitest'