Date: Sunday, January 29, 2023 @ 23:03:53
Author: artafinde
Revision: 1391176
kafka: add support for gradle 7.6
Added:
kafka/trunk/support-gradle-7_6.patch
Modified:
kafka/trunk/PKGBUILD
--------------------------+
PKGBUILD | 18 ++++++++++++-----
support-gradle-7_6.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-29 22:57:48 UTC (rev 1391175)
+++ PKGBUILD 2023-01-29 23:03:53 UTC (rev 1391176)
@@ -8,23 +8,31 @@
arch=('any')
url="https://kafka.apache.org/";
license=('Apache')
-depends=(bash 'java-runtime=17' scala>=2.13)
+depends=(bash 'java-runtime=17')
makedepends=(gradle 'java-environment=17')
source=(
https://downloads.apache.org/$pkgname/$pkgver/$pkgname-$pkgver-src.tgz{,.asc}
+ support-gradle-7_6.patch
)
sha512sums=('385bbe644ca1cce80e8edca0aab76c02d00ef6ba6a408fa18bacef279524662102678d7188b5d814acba476dd7361a1ecd1a8aa34e4425c4d44a640b6dd1aea4'
- 'SKIP')
+ 'SKIP'
+
'defa0ec9ee06829d981aad4be3d69c7c772ad61e4b1e2cce2c5a814638cd47b39f27c3099e35d1ab5779e1cdda29dddd9ae72da65e3e08aade44ce6ef967b5b5')
b2sums=('e4c37a24b5cbb537fc1b117662e30a63bb11373ec6bfa50e017612853cff476833a3e7b4b1a5dc4f69f59091e98b811a99ddbacffc58f9a14cf40c8bd1147861'
- 'SKIP')
+ 'SKIP'
+
'5813d14cef8512e6f36e94086e88ac8cefb3ea2c9a534cded6bf9e59cc6b9125612db972738a12c6f7817b0cd3624b1332787caae445bb022b85ae772fbb0585')
# list of trusted signing keys: https://downloads.apache.org/kafka/KEYS
validpgpkeys=(
5AFBFDA44492C1240E5A45AFF19D6CB551424672 # Chris Egerton (CODE SIGNING
KEY) <[email protected]>
)
+prepare() {
+ cd "$pkgname-$pkgver-src"
+ patch -Np1 < "${srcdir}/support-gradle-7_6.patch"
+}
+
build() {
cd "$pkgname-$pkgver-src"
- ./gradlew -PscalaVersion=$_scalaver releaseTarGz
+ /usr/bin/gradle releaseTarGz -PscalaVersion=$_scalaver
install -vdm 755 "$srcdir/$pkgname-$pkgver-src/dist"
tar -xf "core/build/distributions/${pkgname}_${_scalaver}-$pkgver.tgz"
--strip 1 -C "$srcdir/$pkgname-$pkgver-src/dist"
@@ -33,7 +41,7 @@
# check() {
# TODO unitTest works, IntegrationTest fail, disable for now to save
17mins of build time
# cd "$pkgname-$pkgver-src"
-# ./gradlew -PscalaVersion=$_scalaver unitTest
+# /usr/bin/gradle unitTest -PscalaVersion=$_scalaver
# }
package() {
Added: support-gradle-7_6.patch
===================================================================
--- support-gradle-7_6.patch (rev 0)
+++ support-gradle-7_6.patch 2023-01-29 23:03:53 UTC (rev 1391176)
@@ -0,0 +1,47 @@
+Subject: [PATCH] support-gradle-7.6
+---
+Index: gradle/dependencies.gradle
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
+--- a/gradle/dependencies.gradle (revision
b66af662e61082cb8def576ded1fe5cee37e155f)
++++ b/gradle/dependencies.gradle (date 1675032287344)
+@@ -62,7 +62,7 @@
+ checkstyle: "8.36.2",
+ commonsCli: "1.4",
+ dropwizardMetrics: "4.1.12.1",
+- gradle: "7.4.2",
++ gradle: "7.6",
+ grgit: "4.1.1",
+ httpclient: "4.5.13",
+ easymock: "4.3",
+@@ -119,7 +119,7 @@
+ spotbugs: "4.2.2",
+ swaggerAnnotations: "2.2.0",
+ swaggerJaxrs2: "2.2.0",
+- zinc: "1.3.5",
++ zinc: "1.6.1",
+ zookeeper: "3.6.3",
+ zstd: "1.5.2-1"
+ ]
+Index: build.gradle
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/build.gradle b/build.gradle
+--- a/build.gradle (revision b66af662e61082cb8def576ded1fe5cee37e155f)
++++ b/build.gradle (date 1675032216066)
+@@ -66,8 +66,10 @@
+ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16))
+ defaultJvmArgs.addAll(
+ "--add-opens=java.base/java.io=ALL-UNNAMED",
++ "--add-opens=java.base/java.lang=ALL-UNNAMED",
+ "--add-opens=java.base/java.nio=ALL-UNNAMED",
+ "--add-opens=java.base/java.nio.file=ALL-UNNAMED",
++ "--add-opens=java.base/java.util=ALL-UNNAMED",
+ "--add-opens=java.base/java.util.concurrent=ALL-UNNAMED",
+ "--add-opens=java.base/java.util.regex=ALL-UNNAMED",
+ "--add-opens=java.base/java.util.stream=ALL-UNNAMED",
