Merge branch '2.x' into 3.x

Author: SimY4

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

@@ -1,24 +1,37 @@
 name: Build and Test
 
-on: [ push, pull_request ]
+on:
+  pull_request:
+    branches:
+      - master
+      - 1.x
+      - 2.x
+      - 3.x
+  push:
+    branches:
+      - master
+      - 1.x
+      - 2.x
+      - 3.x
+      - feature/**
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up JDK 11
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: temurin
         java-version: 11
     - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@v3
+      uses: gradle/actions/setup-gradle@v5
     - name: ⚙️ Run build
-      run: ./gradlew build --no-daemon --scan
+      run: ./gradlew build --no-daemon --scan --write-locks
     - name: Publish Test Report
-      uses: mikepenz/action-junit-report@v4
+      uses: mikepenz/action-junit-report@v5
       if: always()
       with:
         report_paths: '**/build/test-results/*/*.xml'
@@ -29,6 +42,6 @@ jobs:
         paths: '**/build/test-results/*/*.xml'
       if: always()
     - name: Code Coverage
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/release.yml

@@ -12,14 +12,14 @@ jobs:
       && !contains(toJSON(github.event.commits.*.message), '[skip release]')
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up JDK 11
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: temurin
         java-version: 11
     - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@v3
+      uses: gradle/actions/setup-gradle@v5
     - name: 🚀 Run release
       run: |
         echo "sonatypeUsername=$SONATYPE_USERNAME" >> gradle.properties

README.md

@@ -1,5 +1,5 @@
 # XPath-to-XML
-[![Build Status](https://github.com/SimY4/xpath-to-xml/workflows/Build%20and%20Test/badge.svg?branch=3.x)](https://github.com/SimY4/xpath-to-xml/actions?query=workflow%3A"Build+and+Test")
+[![Build Status](https://github.com/SimY4/xpath-to-xml/actions/workflows/build-and-test.yml/badge.svg?branch=3.x)](https://github.com/SimY4/xpath-to-xml/actions?query=workflow%3A%22Build+and+Test%22")
 [![codecov](https://codecov.io/gh/SimY4/xpath-to-xml/branch/3.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)
 
@@ -18,9 +18,10 @@ Convenient utility to build XML models by evaluating XPath expressions.
 
 ## Additionally supported models
 
- - jakarta.json
  - Gson
  - Jackson
+ - jakarta.json
+ - org.json
 
 # Usage
 

build.gradle

@@ -1,14 +1,16 @@
 plugins {
-    id 'com.diffplug.spotless' version '6.25.0' apply false
+    id 'com.diffplug.spotless' version '7.2.1' apply false
     id 'info.solidsoft.pitest' version '1.15.0' apply false
     id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
-    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 'me.champeau.jmh' version '0.7.3' apply false
+    id 'net.ltgt.errorprone' version '4.3.0' apply false
+    id 'net.researchgate.release' version '3.1.0'
     id 'org.beryx.jar' version '2.0.0' apply false
 }
 
 subprojects {
+    if (name == 'xpath-to-xml-bom') return // skip empty projects
+
     apply plugin: 'java-library'
     apply plugin: 'org.beryx.jar'
     apply from: rootProject.file('gradle/check-checkstyle.gradle')
@@ -21,6 +23,16 @@ subprojects {
         mavenCentral()
     }
 
+    configurations {
+      [compileClasspath, runtimeClasspath]*.resolutionStrategy*.activateDependencyLocking()
+    }
+
+    dependencies {
+        testImplementation platform(libs.junit.bom)
+
+        testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    }
+
     java {
         withJavadocJar()
         withSourcesJar()
@@ -29,13 +41,6 @@ subprojects {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    // after gradle 5.3 we need to set this attribute to mark test configuration targeting java 8
-    [configurations.testCompileClasspath, configurations.testRuntimeClasspath].each {
-        it.attributes {
-            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 11)
-        }
-    }
-
     compileJava {
         options.release = 8
         options.compilerArgs << '-Xlint:all,-options' << '-Werror'
@@ -68,11 +73,23 @@ subprojects {
         options.addBooleanOption('html5', true)
         options.addStringOption('Xdoclint:all,-missing', '-quiet')
     }
+    
+    tasks.register('resolveAndLock') {
+        notCompatibleWithConfigurationCache('Fitlers configurations at execution time')
+        doFirst {
+            assert gradle.startParameter.writeDependencyLocks : "$path must be run from the the command line with the `--write-locks` flag"
+        }
+        doLast {
+            [configurations.compileClasspath, configurations.runtimeClasspath].each { it.resolve() }
+        }
+    }
 }
 
 nexusPublishing {
     repositories {
         sonatype {
+            nexusUrl = uri("https://ossrh-staging-api.central.sonatype.com/service/local/")
+            snapshotRepositoryUrl = uri("https://central.sonatype.com/repository/maven-snapshots/")
             username = sonatypeUsername
             password = sonatypePassword
         }
@@ -87,5 +104,5 @@ release {
 }
 
 wrapper {
-    gradleVersion = '8.7'
+    gradleVersion = '8.14.3'
 }

gradle.properties

@@ -1,16 +1,9 @@
 group = com.github.simy4.xpath
 version = 3.0.0-SNAPSHOT
 
-projectDescription = Convenient utility to build XML models by evaluating XPath expressions
-projectUrl = https://github.com/SimY4/xpath-to-xml
-projectScm = scm:git:https://github.com/SimY4/xpath-to-xml
-projectIssues = https://github.com/SimY4/xpath-to-xml/issues
-
-#signing.keyId = <keyid>
-#signing.password = <password>
-#signing.secretKeyRingFile = .gnupg/secring.gpg
-
 sonatypeUsername = <username>
 sonatypePassword = <password>
 
+org.gradle.caching = true
 org.gradle.internal.publish.checksums.insecure = true
+org.gradle.parallel = true

gradle/check-codecoverage.gradle

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

gradle/libs.versions.toml

@@ -1,36 +1,26 @@
 [versions]
-errorprone = '2.27.1'
-jackson = '2.17.1'
-scala212 = '2.12.19'
-scala213 = '2.13.14'
-scala3 = '3.3.3'
-scalatest = '3.2.18'
+errorprone = '2.31.0'
+jackson = '2.20.0'
 
 [libraries]
-assertj = 'org.assertj:assertj-core:3.25.3'
-dom4j = 'org.dom4j:dom4j:2.1.4'
+assertj = 'org.assertj:assertj-core:3.27.6'
+dom4j = 'org.dom4j:dom4j:2.2.0'
 errorprone = { module = 'com.google.errorprone:error_prone_core', version.ref = 'errorprone' }
-gson = 'com.google.code.gson:gson:2.11.0'
+gson = 'com.google.code.gson:gson:2.13.2'
 jackson-databind = { module = 'com.fasterxml.jackson.core:jackson-databind', version.ref = 'jackson' }
 jackson-dataformat-yaml = { module = 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml', version.ref = 'jackson' }
 jaxen = 'jaxen:jaxen:2.0.0'
 jdom2 = 'org.jdom:jdom2:2.0.6.1'
+json = 'org.json:json:20250517'
 json-api = 'jakarta.json:jakarta.json-api:2.1.3'
 json-impl = 'org.glassfish:jakarta.json:2.0.1'
-junit-jupiter = 'org.junit.jupiter:junit-jupiter:5.10.2'
-mockito = 'org.mockito:mockito-junit-jupiter:5.12.0'
-scala-library-v212 = { module = 'org.scala-lang:scala-library', version.ref = 'scala212' }
-scala-library-v213 = { module = 'org.scala-lang:scala-library', version.ref = 'scala213' }
-scala-library-v3 = { module = 'org.scala-lang:scala3-library_3', version.ref = 'scala3' }
-scala-reflect-v212 = { module = 'org.scala-lang:scala-reflect', version.ref = 'scala212' }
-scala-reflect-v213 = { module = 'org.scala-lang:scala-reflect', version.ref = 'scala213' }
-scala-xml = 'org.scala-lang.modules:scala-xml_%%:2.3.0'
-scalatest-funspec = { module = 'org.scalatest:scalatest-funspec_%%', version.ref = 'scalatest' }
-scalatest-shouldmatchers = { module = 'org.scalatest:scalatest-shouldmatchers_%%', version.ref = 'scalatest' }
-scalatest-junit-runner = 'org.scalatestplus:junit-5-10_%%:3.2.18.0'
-wartremover = 'org.wartremover:wartremover_%%:3.1.6'
+junit-bom = 'org.junit:junit-bom:5.13.4'
+mockito = 'org.mockito:mockito-junit-jupiter:5.20.0'
+scala-xml = 'org.scala-lang.modules:scala-xml_%%:2.4.0'
+scalatest-funspec = 'org.scalatest:scalatest-funspec_%%:3.2.19'
+scalatest-junit-runner = 'org.scalatestplus:junit-5-12_%%:3.2.19.0'
+wartremover = 'org.wartremover:wartremover_%%:3.3.4'
 xom = 'xom:xom:1.3.9'
 
 [bundles]
-junit = ["junit-jupiter", "assertj"]
-scalatest = ["scalatest-funspec", "scalatest-shouldmatchers", "scalatest-junit-runner"]
+scalatest = ["scalatest-funspec", "scalatest-junit-runner"]

gradle/publish-jar.gradle

@@ -1,10 +1,8 @@
 jar {
-    afterEvaluate {
-        manifest.attributes << [
-            'Built-By': System.properties['user.name'],
-            'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
-            'Implementation-Title': project.name,
-            'Implementation-Version': project.version,
-        ]
-    }
+    manifest.attributes << [
+        'Built-By': System.properties['user.name'],
+        'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
+        'Implementation-Title': project.name,
+        'Implementation-Version': project.version,
+    ]
 }

gradle/publish-maven.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            from components.java
+            from components.find { it.name == 'java' || it.name == 'javaPlatform' }
             versionMapping {
                 usage('java-api') {
                     fromResolutionResult()
@@ -13,28 +13,27 @@ publishing {
                     fromResolutionResult()
                 }
             }
-            afterEvaluate {
-                artifactId = project.name
+            afterEvaluate { project ->
                 pom {
                     name = project.name
-                    description = projectDescription
+                    description = project.description
                     url = 'http://github.com/SimY4/xpath-to-xml'
                     inceptionYear = '2017'
 
                     properties = [
-                        'info.releaseNotesURL': 'https://github.com/SimY4/xpath-to-xml/blob/2.x/CHANGELOG.md',
+                        'info.releaseNotesURL': 'https://github.com/SimY4/xpath-to-xml/releases',
                         'info.versionScheme': 'semver-spec'
                     ]
 
                     scm {
-                        connection = projectScm
-                        developerConnection = projectScm
-                        url = projectUrl
+                        connection = 'scm:git:https://github.com/SimY4/xpath-to-xml'
+                        developerConnection = 'scm:git:https://github.com/SimY4/xpath-to-xml'
+                        url = 'http://github.com/SimY4/xpath-to-xml'
                     }
 
                     issueManagement {
                         system = 'GitHub'
-                        url = projectIssues
+                        url = 'https://github.com/SimY4/xpath-to-xml/issues'
                     }
 
                     licenses {