From 3cefca094084a171e26cf46fcf97a6ae64db8434 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 9 Dec 2023 23:58:25 +0100 Subject: [PATCH] Add 4.31 target platform and update orbit to 4.31 and update bytebuddy to 1.14.10. Change-Id: I145776a31d806f7e6dcc90263650109b3eb19067 --- WORKSPACE | 6 +- .../org.eclipse.jgit.target/jgit-4.17.target | 6 +- .../org.eclipse.jgit.target/jgit-4.18.target | 6 +- .../org.eclipse.jgit.target/jgit-4.19.target | 6 +- .../org.eclipse.jgit.target/jgit-4.20.target | 6 +- .../org.eclipse.jgit.target/jgit-4.21.target | 6 +- .../org.eclipse.jgit.target/jgit-4.22.target | 6 +- .../org.eclipse.jgit.target/jgit-4.23.target | 6 +- .../org.eclipse.jgit.target/jgit-4.24.target | 6 +- .../org.eclipse.jgit.target/jgit-4.25.target | 6 +- .../org.eclipse.jgit.target/jgit-4.26.target | 6 +- .../org.eclipse.jgit.target/jgit-4.27.target | 6 +- .../org.eclipse.jgit.target/jgit-4.28.target | 6 +- .../org.eclipse.jgit.target/jgit-4.29.target | 6 +- .../org.eclipse.jgit.target/jgit-4.30.target | 6 +- .../org.eclipse.jgit.target/jgit-4.31.target | 272 ++++++++++++++++++ .../org.eclipse.jgit.target/jgit-4.31.tpd | 8 + .../maven/dependencies.tpd | 4 +- .../orbit/orbit-4.31.tpd | 27 ++ pom.xml | 2 +- 20 files changed, 355 insertions(+), 48 deletions(-) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd diff --git a/WORKSPACE b/WORKSPACE index 71a27c26e8..58a0a73eab 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -188,18 +188,18 @@ maven_jar( sha1 = "ebbf338e33f893139459ce5df023115971c2786f", ) -BYTE_BUDDY_VERSION = "1.14.8" +BYTE_BUDDY_VERSION = "1.14.10" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "505d7d8937ff00cc55db79723e26c94069b87d66", + sha1 = "8117daf4a612122eb4f517f66adff778cb8b4737", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "ae6ebe485f3bcd0a1e20241488a32e6400a501ef", + sha1 = "90ed94ac044ea8953b224304c762316e91fd6b31", ) maven_jar( 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 4879c3a0b3..56c0ded536 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 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 62b67439b5..c1c3679dc4 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 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 269334b7a7..6651557390 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 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 dab00e85e3..1e3f236896 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 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 2c9689fb14..7edd8da616 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 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 adf6fb123b..c7dd09210a 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 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 5907d7f6ff..03aa383342 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 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 9df673cd02..4318b6ad3b 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 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 d9c55b6ddc..eb5976a113 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 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 02fa46f8eb..24f8b00160 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 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 3579da43b5..fadd5530e3 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 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 1900424ea6..aeabd4fea5 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,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 8c7c1ac66f..f7ecb81337 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 8fbc56760e..51e5adc208 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 jar net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target new file mode 100644 index 0000000000..2b714fdbbd --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -0,0 +1,272 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.tukaani + xz + 1.9 + jar + + + + + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.11.0 + jar + + + org.apache.sshd + sshd-sftp + 2.11.0 + jar + + + + + + + org.mockito + mockito-core + 5.7.0 + jar + + + + + + + net.java.dev.jna + jna + 5.13.0 + jar + + + net.java.dev.jna + jna-platform + 5.13.0 + jar + + + + + + + org.eclipse.jetty + jetty-http + 10.0.18 + jar + + + org.eclipse.jetty + jetty-io + 10.0.18 + jar + + + org.eclipse.jetty + jetty-security + 10.0.18 + jar + + + org.eclipse.jetty + jetty-server + 10.0.18 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.18 + jar + + + org.eclipse.jetty + jetty-util + 10.0.18 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.18 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + org.hamcrest + hamcrest + 2.2 + jar + + + + + + + com.google.code.gson + gson + 2.10.1 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.14.10 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.10 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.77 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.77 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.77 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.77 + jar + + + + + + + org.assertj + assertj-core + 3.24.2 + jar + + + + + + + args4j + args4j + 2.33 + jar + + + + + + + commons-codec + commons-codec + 1.16.0 + jar + + + org.apache.commons + commons-compress + 1.25.0 + jar + + + commons-logging + commons-logging + 1.2 + jar + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd new file mode 100644 index 0000000000..58491c85d5 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd @@ -0,0 +1,8 @@ +target "jgit-4.31" with source configurePhase + +include "orbit/orbit-4.31.tpd" +include "maven/dependencies.tpd" + +location "https://download.eclipse.org/staging/2024-03/" { + org.eclipse.osgi lazy +} 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 10d707f3d2..4a636c0ac0 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 @@ -87,12 +87,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.14.9" + version = "1.14.10" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.14.9" + version = "1.14.10" } } diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd new file mode 100644 index 0000000000..0554a8578c --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd @@ -0,0 +1,27 @@ +target "orbit-4.30" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12" { + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + net.i2p.crypto.eddsa [0.3.0,0.3.0] + net.i2p.crypto.eddsa.source [0.3.0,0.3.0] + org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] + org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.objenesis [3.3,3.3] + org.objenesis.source [3.3,3.3] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} diff --git a/pom.xml b/pom.xml index b986b5a27a..951e17c393 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.24.2 5.13.0 - 1.14.9 + 1.14.10 jacoco -- 2.39.5