From 7e67fe1d4065e84081f617bb08efc3fe006512da Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 15 May 2023 23:40:17 +0200 Subject: [PATCH] Use gson directly from Maven Central Change-Id: I4741f733aa7ca219296ed788d4dc93df77cc65ff --- .../org.eclipse.jgit.target/jgit-4.17.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.18.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.19.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.20.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.21.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.22.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.23.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.24.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.25.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.26.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.27.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.28.target | 14 +++++++++++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 13 +++++++++++++ .../orbit/R20230302014618-2023-03.tpd | 2 -- 14 files changed, 145 insertions(+), 38 deletions(-) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index dda5d05079..d85225f7e0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index 01a037ff93..acf39e54f0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index 0692455ac9..7f3bf74538 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index c80d8a9ace..9bfa6b09bb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index 5876755fab..853f00724c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index 8cdef6315f..09b76317b2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index e8fad3d2e5..5f70cb9d72 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index 89ba3dc7a7..df9d46d43d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index a75f0b4635..dca02f367d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index b1e0d7f53f..f09ff8e3fc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index f7a71b901a..e0052fd32f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 2a43a08ce9..b11fc141a0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,11 +1,9 @@ - + - - @@ -144,6 +142,16 @@ + + + + com.google.code.gson + gson + 2.10.1 + jar + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index a73dd02c2f..e7b5adde18 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -60,6 +60,19 @@ maven bouncycastle } } +maven gson + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "com.google.code.gson" + artifactId = "gson" + version = "2.10.1" + } +} + maven javaewah scope = compile dependencyDepth = none diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd index 7f193fd46d..4bcd907445 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd @@ -2,8 +2,6 @@ target "R20230302014618-2023-03" with source configurePhase // see https://download.eclipse.org/tools/orbit/downloads/ location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository" { - com.google.gson [2.10.1.v20230109-0753,2.10.1.v20230109-0753] - com.google.gson.source [2.10.1.v20230109-0753,2.10.1.v20230109-0753] com.jcraft.jsch [0.1.55.v20221112-0806,0.1.55.v20221112-0806] com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806] com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820] -- 2.39.5