From 8854d48395b511ede04390781e9a7d3599027346 Mon Sep 17 00:00:00 2001 From: Martin Wittlinger Date: Tue, 5 Sep 2023 17:11:02 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20json=20value=20names=20in?= =?UTF-8?q?=20lockfile=20(#403)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- github_action/lockfile.json | 2 +- lockfile.json | 2 +- maven_plugin/lockfile.json | 30 +++++++++---------- .../maven_lockfile/data/LockFile.java | 8 +++-- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/github_action/lockfile.json b/github_action/lockfile.json index 8838de51..1b489b1a 100644 --- a/github_action/lockfile.json +++ b/github_action/lockfile.json @@ -1,7 +1,7 @@ { "artifactID": "maven-lockfile-github-action", "groupID": "io.github.chains-project", - "version": "4.2.1-SNAPSHOT", + "version": "4.2.2-SNAPSHOT", "lockFileVersion": 1, "dependencies": [ { diff --git a/lockfile.json b/lockfile.json index 321daad9..f847f20d 100644 --- a/lockfile.json +++ b/lockfile.json @@ -1,7 +1,7 @@ { "artifactID": "maven-lockfile-parent", "groupID": "io.github.chains-project", - "version": "4.2.1-SNAPSHOT", + "version": "4.2.2-SNAPSHOT", "lockFileVersion": 1, "dependencies": [], "mavenPlugins": [ diff --git a/maven_plugin/lockfile.json b/maven_plugin/lockfile.json index c4908698..740cba01 100644 --- a/maven_plugin/lockfile.json +++ b/maven_plugin/lockfile.json @@ -1,7 +1,7 @@ { "artifactID": "maven-lockfile", "groupID": "io.github.chains-project", - "version": "4.2.1-SNAPSHOT", + "version": "4.2.2-SNAPSHOT", "lockFileVersion": 1, "dependencies": [ { @@ -550,7 +550,7 @@ "checksumAlgorithm": "sha1", "checksum": "6c62681a2f655b49963a5983b8b0950a6120ae14", "scope": "test", - "selectedVersion": "2.0.7", + "selectedVersion": "2.0.9", "id": "org.slf4j:slf4j-api:1.7.36", "parent": "org.apache.maven.resolver:maven-resolver-named-locks:1.9.14", "children": [] @@ -588,7 +588,7 @@ "checksumAlgorithm": "sha1", "checksum": "6c62681a2f655b49963a5983b8b0950a6120ae14", "scope": "test", - "selectedVersion": "2.0.7", + "selectedVersion": "2.0.9", "id": "org.slf4j:slf4j-api:1.7.36", "parent": "org.apache.maven.resolver:maven-resolver-impl:1.9.14", "children": [] @@ -1821,7 +1821,7 @@ "checksumAlgorithm": "sha1", "checksum": "6b262da268f8ad9eff941b25503a9198f0a0ac93", "scope": "compile", - "selectedVersion": "2.0.7", + "selectedVersion": "2.0.9", "id": "org.slf4j:slf4j-api:1.7.5", "parent": "org.apache.maven.shared:maven-artifact-transfer:0.13.1", "children": [] @@ -1857,7 +1857,7 @@ "checksumAlgorithm": "sha1", "checksum": "6c62681a2f655b49963a5983b8b0950a6120ae14", "scope": "compile", - "selectedVersion": "2.0.7", + "selectedVersion": "2.0.9", "id": "org.slf4j:slf4j-api:1.7.36", "parent": "org.apache.maven.shared:maven-dependency-tree:3.2.1", "children": [] @@ -1892,7 +1892,7 @@ "checksumAlgorithm": "sha1", "checksum": "41eb7184ea9d556f23e18b5cb99cad1f8581fc00", "scope": "test", - "selectedVersion": "2.0.7", + "selectedVersion": "2.0.9", "id": "org.slf4j:slf4j-api:2.0.7", "parent": "org.instancio:instancio-core:3.2.0", "children": [] @@ -2050,23 +2050,23 @@ { "groupId": "org.slf4j", "artifactId": "log4j-over-slf4j", - "version": "2.0.7", + "version": "2.0.9", "checksumAlgorithm": "sha1", - "checksum": "c7d822e808babcb3ca3f390e1992d483a26aa53", + "checksum": "47b18c09cda4a3bba2197ed6827cf6390c2a0adb", "scope": "compile", - "selectedVersion": "2.0.7", - "id": "org.slf4j:log4j-over-slf4j:2.0.7", + "selectedVersion": "2.0.9", + "id": "org.slf4j:log4j-over-slf4j:2.0.9", "children": [ { "groupId": "org.slf4j", "artifactId": "slf4j-api", - "version": "2.0.7", + "version": "2.0.9", "checksumAlgorithm": "sha1", - "checksum": "41eb7184ea9d556f23e18b5cb99cad1f8581fc00", + "checksum": "7cf2726fdcfbc8610f9a71fb3ed639871f315340", "scope": "compile", - "selectedVersion": "2.0.7", - "id": "org.slf4j:slf4j-api:2.0.7", - "parent": "org.slf4j:log4j-over-slf4j:2.0.7", + "selectedVersion": "2.0.9", + "id": "org.slf4j:slf4j-api:2.0.9", + "parent": "org.slf4j:log4j-over-slf4j:2.0.9", "children": [] } ] diff --git a/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/data/LockFile.java b/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/data/LockFile.java index 2c04346f..4fe1ba8c 100644 --- a/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/data/LockFile.java +++ b/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/data/LockFile.java @@ -18,10 +18,14 @@ */ public class LockFile { - @SerializedName("artifactID") + @SerializedName( + value = "artifactId", + alternate = {"artifactID"}) private final ArtifactId name; - @SerializedName("groupID") + @SerializedName( + value = "groupId", + alternate = {"groupID"}) private final GroupId groupId; @SerializedName("version")