From e7f572e409d5b2d602cf30513cd5e21bfa743ee7 Mon Sep 17 00:00:00 2001 From: Simon Taddiken Date: Tue, 16 Jan 2024 12:19:06 +0100 Subject: [PATCH 1/6] Update dependencies --- gradle.properties | 4 ++-- readme/RELEASE_NOTES.md | 3 ++- settings.gradle | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 41f9e04..4f02908 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group = de.skuzzle.test -version = 1.10.2-SNAPSHOT +version = 1.11.0-SNAPSHOT githubUser = skuzzle githubRepo = snapshot-tests org.gradle.caching=true -org.gradle.parallel=true \ No newline at end of file +org.gradle.parallel=true diff --git a/readme/RELEASE_NOTES.md b/readme/RELEASE_NOTES.md index 4a75ef7..bc490a0 100644 --- a/readme/RELEASE_NOTES.md +++ b/readme/RELEASE_NOTES.md @@ -19,7 +19,8 @@ ### Changes -* [#93](https://github.com/skuzzle/snapshot-tests/issues/93): Fix bug in determining the line ending from _git_ +* Update to JUnit `5.10.1` (coming from `5.9.2`) +* Update to opentest4j `1.3.0` (coming from `1.3.0`) ## Reference Documentation diff --git a/settings.gradle b/settings.gradle index c383645..030325f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -64,7 +64,7 @@ dependencyResolutionManagement { library('jaxb-api-jakarta', 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0') library('jaxb-runtime-jakarta', 'org.glassfish.jaxb:jaxb-runtime:4.0.1') - library('junit-bom', 'org.junit:junit-bom:5.9.2') + library('junit-bom', 'org.junit:junit-bom:5.10.1') library('jackson-bom', 'com.fasterxml.jackson:jackson-bom:2.14.2') library('assertj-core', 'org.assertj:assertj-core:3.24.2') library('equalsverifier', 'nl.jqno.equalsverifier:equalsverifier:3.9') @@ -72,7 +72,7 @@ dependencyResolutionManagement { library('javadiffutils', 'io.github.java-diff-utils:java-diff-utils:4.12') library('bytebuddy', 'net.bytebuddy:byte-buddy:1.12.22') library('jsonassert', 'org.skyscreamer:jsonassert:1.5.1') - library('opentest4j', 'org.opentest4j:opentest4j:1.2.0') + library('opentest4j', 'org.opentest4j:opentest4j:1.3.0') library('jsoup', 'org.jsoup:jsoup:1.15.3') library('junit4', 'junit:junit:4.13.2') } From cce032ca540f8387a2a62ae0716c4a7992ef1bc1 Mon Sep 17 00:00:00 2001 From: Simon Taddiken Date: Tue, 16 Jan 2024 12:26:21 +0100 Subject: [PATCH 2/6] Fix build docker image --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1f862f8..47d47b3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,8 @@ pipeline { agent { docker { - image 'eclipse-temurin:11' + // Need an image with git installed that is why we stick with maven image for now though we're using gradle + image 'maven:3.6-jdk-11' args '-v /home/jenkins/.gradle:/var/gradle/.gradle -v /home/jenkins/.gnupg:/.gnupg -e GRADLE_OPTS=-Duser.home=/var/gradle' } } From 910fd1788286a276e7476da278c094ecd7c94a5c Mon Sep 17 00:00:00 2001 From: Simon Taddiken Date: Tue, 16 Jan 2024 14:26:08 +0100 Subject: [PATCH 3/6] Update further dependencies --- readme/RELEASE_NOTES.md | 6 +++++- settings.gradle | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/readme/RELEASE_NOTES.md b/readme/RELEASE_NOTES.md index bc490a0..ea31aa4 100644 --- a/readme/RELEASE_NOTES.md +++ b/readme/RELEASE_NOTES.md @@ -21,7 +21,11 @@ * Update to JUnit `5.10.1` (coming from `5.9.2`) * Update to opentest4j `1.3.0` (coming from `1.3.0`) - +* Update to jackson `2.16.1` (coming from `2.14.2`) +* Update to assertj `3.25.1` (coming from `3.24.2`) +* Update to jakarta.xml.bind-api `4.0.1` (coming from `4.0.0`) +* Update to jaxb-runtime `2.3.9` (coming from `2.3.3`) +* (Jakarta) Update to jaxb-runtime `4.0.4` (coming from `4.0.1`) ## Reference Documentation diff --git a/settings.gradle b/settings.gradle index 030325f..0327f0b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -59,15 +59,15 @@ dependencyResolutionManagement { library('xmlunit-jakarta-jaxb-impl', 'org.xmlunit', 'xmlunit-jakarta-jaxb-impl').versionRef('xmlunit') library('jaxb-api-legacy', 'javax.xml.bind:jaxb-api:2.3.1') - library('jaxb-runtime-legacy', 'org.glassfish.jaxb:jaxb-runtime:2.3.3') + library('jaxb-runtime-legacy', 'org.glassfish.jaxb:jaxb-runtime:2.3.9') - library('jaxb-api-jakarta', 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0') - library('jaxb-runtime-jakarta', 'org.glassfish.jaxb:jaxb-runtime:4.0.1') + library('jaxb-api-jakarta', 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1') + library('jaxb-runtime-jakarta', 'org.glassfish.jaxb:jaxb-runtime:4.0.4') library('junit-bom', 'org.junit:junit-bom:5.10.1') - library('jackson-bom', 'com.fasterxml.jackson:jackson-bom:2.14.2') - library('assertj-core', 'org.assertj:assertj-core:3.24.2') - library('equalsverifier', 'nl.jqno.equalsverifier:equalsverifier:3.9') + library('jackson-bom', 'com.fasterxml.jackson:jackson-bom:2.16.1') + library('assertj-core', 'org.assertj:assertj-core:3.25.1') + library('equalsverifier', 'nl.jqno.equalsverifier:equalsverifier:3.15.6') library('apiguardian', 'org.apiguardian:apiguardian-api:1.1.2') library('javadiffutils', 'io.github.java-diff-utils:java-diff-utils:4.12') library('bytebuddy', 'net.bytebuddy:byte-buddy:1.12.22') From 057b040281150c2141a7af767017f613bf9803ee Mon Sep 17 00:00:00 2001 From: Simon Taddiken Date: Tue, 16 Jan 2024 14:26:39 +0100 Subject: [PATCH 4/6] Prepare release candidate --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4f02908..7053a32 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = de.skuzzle.test -version = 1.11.0-SNAPSHOT +version = 1.11.0-rc-1-SNAPSHOT githubUser = skuzzle githubRepo = snapshot-tests From b6689a2bdf0ee3f69ad53d70f572c127cb9d7f5b Mon Sep 17 00:00:00 2001 From: Simon Taddiken Date: Tue, 16 Jan 2024 15:05:04 +0100 Subject: [PATCH 5/6] Prepare release candidate --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7053a32..4f02908 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = de.skuzzle.test -version = 1.11.0-rc-1-SNAPSHOT +version = 1.11.0-SNAPSHOT githubUser = skuzzle githubRepo = snapshot-tests From bf09bfa23dba95e0006006b609f2d7e167898ca3 Mon Sep 17 00:00:00 2001 From: Simon Taddiken Date: Tue, 16 Jan 2024 15:09:59 +0100 Subject: [PATCH 6/6] Use admonition --- readme/RELEASE_NOTES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme/RELEASE_NOTES.md b/readme/RELEASE_NOTES.md index ea31aa4..0c20f5c 100644 --- a/readme/RELEASE_NOTES.md +++ b/readme/RELEASE_NOTES.md @@ -1,6 +1,6 @@ **Migration Info**: -> **Note** +> [!NOTE] > The following modules have been deprecated: `snapshot-tests-jackson`, `snapshot-tests-jaxb` and > `snapshot-tests-jaxb-jakarta`. New drop-in replacements are provided via `snapshot-tests-json`, > `snapshpt-tests-xml-legacy` and `snapshot-tests-xml`. (See also: @@ -11,7 +11,7 @@ > > The deprecated modules will be removed with the next major version! -> **Note** +> [!NOTE] > When upgrading from a version prior to `1.8.0`, instead of depending on `snapshot-tests-core` you should now > either depend on `snapshot-tests-junit5` or `snapshot-tests-junit4`. > This will become mandatory with the next major version!