Date: Monday, May 15, 2023 @ 15:32:43 Author: artafinde Revision: 1461833
upgpkg: solr 9.2.1-1 user gradle wrapper until solr officially supports gradle 8.x Added: solr/trunk/keys/pgp/FDB3D11D716BB32ACF8C93AB919B21537AA80271.asc Modified: solr/trunk/PKGBUILD solr/trunk/allow-using-system-gradle.patch solr/trunk/skip-checks-for-git-repo.patch solr/trunk/skip-failing-test.patch solr/trunk/support-reproducible-builds.patch -------------------------------------------------------+ PKGBUILD | 32 ++++---- allow-using-system-gradle.patch | 56 +++++--------- keys/pgp/FDB3D11D716BB32ACF8C93AB919B21537AA80271.asc | 1 skip-checks-for-git-repo.patch | 60 ++++++++-------- skip-failing-test.patch | 9 +- support-reproducible-builds.patch | 40 +++++----- 6 files changed, 95 insertions(+), 103 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-05-15 15:18:08 UTC (rev 1461832) +++ PKGBUILD 2023-05-15 15:32:43 UTC (rev 1461833) @@ -1,7 +1,7 @@ # Maintainer: David Runge <[email protected]> pkgname=solr -pkgver=9.1.1 +pkgver=9.2.1 pkgrel=1 pkgdesc="Open source enterprise search platform built on Apache Lucene" arch=(any) @@ -20,7 +20,7 @@ etc/$pkgname/zoo.cfg ) source=( - https://downloads.apache.org/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver-src.tgz{,.asc} + https://archive.apache.org/dist/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver-src.tgz{,.asc} $pkgname.service $pkgname.sysusers $pkgname.tmpfiles @@ -29,24 +29,24 @@ skip-checks-for-git-repo.patch allow-using-system-gradle.patch ) -sha512sums=('3b1694268a2c17349a677b6e7e5150aaa695d7eac4f948ed00b4054d80e7aed1b4d564f239a2eecb8f59f029a0daf9777698b4467c2c8b230288a2fa981a8b03' +sha512sums=('b23c4a086fa9fb5fca1027ea751026e139babde486082039fd6ffbbb096445f38eb4d8486bfbf25fa407389e192a3b82b1da1651a083515e5c18f0d72078dfc0' 'SKIP' 'd9a5dcc7a30bf449abf9028bc4aa88e196c953d82b884661ec3191d4a06ec50b106c01ecdcd225e3526ab4f4ce5634d6dcd4a03f1e128fdd4c26febb1b742532' '06e5e40b96d2b6668790e4b166fc2867b9e694a2c72fd57eec702526e009b8b0495acbe16a5a27e259827477f4783ce87742f1f806254d8a2baec23b0b317058' '97252d1ba1e4e211a6b5a038981cbc9d6663a0d7a980b23484f838eebb2f8194571a3f34ea6b92ed0efd4b7f862e020b5e3e8478ad1de1c6832e232d0b20ff6d' - '2f3d944a9b5d1983b745f8fab99ed083f411e374aeecf61b290bed50591c3d59a570856c414ded00bbf26862156b4ef8839719eb5b6fd30ecccad9d09c142844' - '43267da8d3061ddb6a1e93166e049a1381fd926e7738d858be4eea65fc09def9edc9890e5b78f1a3445dae301cae358542cbb3ab1b5b805275834b77452fa9cc' - 'f7abe1507b7483988e1401ee10ab673a3ad5f47a26a1330f5eec001aa2d7bb698260f46aa59909b9df2d2b915a2b3b41c8b99d28b645ae1bee10731a13a6ead5' - '25cdcc4a12353e530323e2e90a3793a1dbe834aa73c40812c02b3706de1ad53a2237ee5d81ea6e7c6aaaa738b0ffb322fcacab730df98f4b82a5b7da454ba1ce') -b2sums=('329bc462c9a5fc84cdcc9675f0a7503ca991a20e83cc326817f9a80ad9b8c3e09e7fd4448349b820841af782c2af8d87b6a971508c8fbc66fc94335616a11947' + 'd8c3fcf66b9ad0b101e0bcfb025546f7a708afc53c845a05e2346cb9a3659d3f2f8773a5754fefc6fe98693f6ade5e0c6346b710fe2d0c2c55b12fcaed0e1f18' + '8daad1f07686984d59c459317936a73dfc35599b4e50f0c2bab769b42950117aae56e775f028c5241c877c771241d9fc5666cc57500a4e94576bfd30be421fe9' + '7e917f42efb0e9bb01916842542fcbb4838a6ad0d318c8935f2649a63c70d8ab8e30930d7b87b2b0bce763382b8b810d2182ffcde9ada9092a499f657dd9c20c' + '5e45fcd63be50484dbdd7b909f187d4d90a89639b80571bd93c432599b2064498344d4168dd06dfc45368ce043a873ae6be804d3ff1a3c42746b045c215cab92') +b2sums=('c9003c7a1534d1f3e71a150cfb1a17fcfdd890e1625b3182c6e1873c082bfa41fb46b2c15c2a117400a1ae7a5c1cfc891d6a2c7b6d4994cc18cdf58bb0420623' 'SKIP' 'f970329fad0358cb19af9b9337047612d5949af8aea2dc7acd6c8424ba494644940d22f46b98a9cf1362ea2e5d966b863907de35e7c0edc2e48f7b0ed00473b7' '60ff37059a4ab8362551518d56ee105e7d19199727605d5ad6f3236bd31dde1cc5fa37ffa37009820ee3115da36ae64df4754454cef1db51d1c13cac039245cb' '37ab5d9af1da1178fcc58ce39654fdecb842b24d4e2264a2eec95c10223e7d003f27a6b2957a267a17ce0fa72258d96642d5b909963576a5a7d13e4e05c47a51' - '0461317bffddbcc6438efcb611283628863bb6af852ceeb0a369bad7105010d12dbdf5e9b78bfb838500d019b1c2e9d588c5620450385cd6933edb2946865a11' - '4aa232c056725eb7fac58d2ba1531209c706e8a3a6982c7cc9ad214b8105ef0950d872f272c4b3be5e4145dee1d2185ca6840d796b01d973219508ca31352ba0' - '32ab4ad7b66ddcfaf946190e8f1a956060783108d5f079f5888aa409d5fe42cadb5fcb151857bd23a938bc00b10008d396f4def46a696340ef362794846ceba0' - '564cd7389806a2fbc84985ca954eb46b65c61fe219add88137f6047d2d6acea3c188e6597d7d2332f0fe9892d1a7ebcc506fb67b649e90a3e5143525a3ff0836') + 'f9a7922b200942d0cf42920ffe9b39180dd7d370074c8d41c89d7096baac3dacd9ce4eb00d36f698ed5d27ef0e75e822c722029c93c22fd8c68a38bfe64ac42a' + '21c65f14aa76a8110fed7d7b684c22342c72510376f68c2cde5ebf4ea996f38e287a29429ac7ebd93b68dbbffe030149b31d06a1dbc4b80c2182c14c53684c0a' + 'ae58f98e20e3dc68070e180c59884e747b19bec0ce6d6197cf85cff596ce99d1437386eb89b5aad494668bc19c021f89726826c6956cea14524f94879398c8dc' + 'ef52cfc76c484b78bacfee8a6e6321d80d3a03bdf11f81ab15e8328dd680cc87010e34a3f59423325707f60c87fe03fb2e77a082140e364d61ebaf5582101f59') # list of trusted signing keys: https://downloads.apache.org/solr/KEYS validpgpkeys=( 2085660D9C1FCCACC4A479A3BF160FF14992A24C # Ishan Chattopadhyaya <[email protected]> @@ -63,6 +63,7 @@ E6E21FFCDCEA14C95910EA65051A0FAF76BC6507 # Adrien Grand (CODE SIGNING KEY) <[email protected]> 3558857D1F5754B78C7F8B5A71A45A3D0D8D0B93 # Jan Høydahl (CODE SIGNING KEY) <[email protected]> C3E7CBD9B9FE2B419EB14B89612B39A5BC981763 # Michael A. Gibney <[email protected]> + FDB3D11D716BB32ACF8C93AB919B21537AA80271 # Justin Sweeney (CODE SIGNING KEY) <[email protected]> ) prepare() { @@ -70,7 +71,7 @@ patch -Np1 -i "$srcdir"/support-reproducible-builds.patch patch -Np1 -i "$srcdir"/skip-failing-test.patch patch -Np1 -i "$srcdir"/skip-checks-for-git-repo.patch - patch -Np1 -i "$srcdir"/allow-using-system-gradle.patch + # patch -Np1 -i "$srcdir"/allow-using-system-gradle.patch } build() { @@ -79,7 +80,8 @@ # override adding -SNAPSHOT on version # skip signing of jars # skip generation of reference guide - /usr/bin/gradle \ + # + ./gradlew \ -Dversion.release=$pkgver \ assembleRelease \ -Psign=false -x signJarsPublication \ @@ -92,7 +94,7 @@ check() { cd $pkgname-$pkgver - /usr/bin/gradle \ + ./gradlew \ -Dversion.release=$pkgver \ test \ -Prefguide.include=false Modified: allow-using-system-gradle.patch =================================================================== --- allow-using-system-gradle.patch 2023-05-15 15:18:08 UTC (rev 1461832) +++ allow-using-system-gradle.patch 2023-05-15 15:32:43 UTC (rev 1461833) @@ -1,5 +1,22 @@ -Subject: [PATCH] allow-using-system-gradle +Subject: [PATCH] allow-system-gradle --- +Index: gradle/testing/defaults-tests.gradle +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/gradle/testing/defaults-tests.gradle b/gradle/testing/defaults-tests.gradle +--- a/gradle/testing/defaults-tests.gradle (revision 92c5515e2918c22513f7aa527d6c6db943150fea) ++++ b/gradle/testing/defaults-tests.gradle (date 1681295313069) +@@ -89,7 +89,7 @@ + + tasks.withType(Test) { + ext { +- testOutputsDir = file("${reports.junitXml.destination}/outputs") ++ testOutputsDir = file("${reports.junitXml.outputLocation.get()}/outputs") + } + + // LUCENE-9660: Make it possible to always rerun tests, even if they're incrementally up-to-date. Index: buildSrc/build.gradle IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP @@ -6,8 +23,8 @@ <+>UTF-8 =================================================================== diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle ---- a/buildSrc/build.gradle (revision d998e63978abfedde3b75bab4ba6e1e78ddb5944) -+++ b/buildSrc/build.gradle (date 1674638041199) +--- a/buildSrc/build.gradle (revision 92c5515e2918c22513f7aa527d6c6db943150fea) ++++ b/buildSrc/build.gradle (date 1681295152900) @@ -25,7 +25,6 @@ } @@ -16,36 +33,3 @@ // Load common buildSrc and script deps. apply from: file("scriptDepVersions.gradle") -Index: gradle/testing/alternative-jdk-support.gradle -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/gradle/testing/alternative-jdk-support.gradle b/gradle/testing/alternative-jdk-support.gradle ---- a/gradle/testing/alternative-jdk-support.gradle (revision d998e63978abfedde3b75bab4ba6e1e78ddb5944) -+++ b/gradle/testing/alternative-jdk-support.gradle (date 1674639345031) -@@ -3,6 +3,7 @@ - import org.gradle.internal.jvm.Jvm - import org.gradle.internal.jvm.inspection.JvmInstallationMetadata - import org.gradle.internal.jvm.inspection.JvmMetadataDetector -+import org.gradle.jvm.toolchain.internal.InstallationLocation - - /* - * Licensed to the Apache Software Foundation (ASF) under one or more -@@ -49,7 +50,7 @@ - doFirst { - - def jvmInfo = { JavaInfo javaInfo -> -- JvmInstallationMetadata jvmMetadata = jvmDetector.getMetadata(javaInfo.javaHome) -+ JvmInstallationMetadata jvmMetadata = jvmDetector.getMetadata(new InstallationLocation(jvmCurrent.javaHome, "specific path")).getLanguageVersion() - return "${jvmMetadata.languageVersion} (${jvmMetadata.displayName} ${jvmMetadata.runtimeVersion}, home at: ${jvmMetadata.javaHome})" - } - -@@ -86,6 +87,6 @@ - - // Set up root project's properties. - rootProject.ext.runtimeJavaHome = jvmCurrent.javaHome --rootProject.ext.runtimeJavaVersion = jvmDetector.getMetadata(jvmCurrent.javaHome).languageVersion -+rootProject.ext.runtimeJavaVersion = jvmDetector.getMetadata(new InstallationLocation(jvmCurrent.javaHome, "specific path")).getLanguageVersion() - rootProject.ext.usesAltJvm = (jvmGradle != jvmCurrent); - Added: keys/pgp/FDB3D11D716BB32ACF8C93AB919B21537AA80271.asc =================================================================== (Binary files differ) Index: solr/trunk/keys/pgp/FDB3D11D716BB32ACF8C93AB919B21537AA80271.asc =================================================================== --- keys/pgp/FDB3D11D716BB32ACF8C93AB919B21537AA80271.asc 2023-05-15 15:18:08 UTC (rev 1461832) +++ keys/pgp/FDB3D11D716BB32ACF8C93AB919B21537AA80271.asc 2023-05-15 15:32:43 UTC (rev 1461833) Property changes on: solr/trunk/keys/pgp/FDB3D11D716BB32ACF8C93AB919B21537AA80271.asc ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/pgp-keys \ No newline at end of property Modified: skip-checks-for-git-repo.patch =================================================================== --- skip-checks-for-git-repo.patch 2023-05-15 15:18:08 UTC (rev 1461832) +++ skip-checks-for-git-repo.patch 2023-05-15 15:32:43 UTC (rev 1461833) @@ -1,29 +1,21 @@ Subject: [PATCH] skip-checks-for-git-repo --- -Index: solr/distribution/build.gradle +Index: solr/distribution/source-release.gradle IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== -diff --git a/solr/distribution/build.gradle b/solr/distribution/build.gradle ---- a/solr/distribution/build.gradle (revision d998e63978abfedde3b75bab4ba6e1e78ddb5944) -+++ b/solr/distribution/build.gradle (date 1674639705715) -@@ -70,7 +70,6 @@ +diff --git a/solr/distribution/source-release.gradle b/solr/distribution/source-release.gradle +--- a/solr/distribution/source-release.gradle (revision 92c5515e2918c22513f7aa527d6c6db943150fea) ++++ b/solr/distribution/source-release.gradle (date 1681294983703) +@@ -23,7 +23,6 @@ + description "Assemble source Solr artifact as a .tgz file." - files = objects.fileCollection() - [ -- tasks.assembleSourceTgz, - distTarTask, - ].each { dep -> - dependsOn dep -@@ -129,7 +128,6 @@ - }) + // Make sure no unstaged/ dirty files are present. +- dependsOn ":gitStatus", ":checkWorkingCopyClean" - from tasks.prepareGitRev -- from tasks.assembleSourceTgz - from distTarTask - - from tasks.computeChecksums + ext { + destination = file("${buildDir}/packages/solr-${version}-src.tgz") Index: gradle/validation/precommit.gradle IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP @@ -30,8 +22,8 @@ <+>UTF-8 =================================================================== diff --git a/gradle/validation/precommit.gradle b/gradle/validation/precommit.gradle ---- a/gradle/validation/precommit.gradle (revision d998e63978abfedde3b75bab4ba6e1e78ddb5944) -+++ b/gradle/validation/precommit.gradle (date 1674640572646) +--- a/gradle/validation/precommit.gradle (revision 92c5515e2918c22513f7aa527d6c6db943150fea) ++++ b/gradle/validation/precommit.gradle (date 1681294983698) @@ -48,6 +48,5 @@ // Each validation task should be attached to check but make sure @@ -39,19 +31,27 @@ - check.dependsOn precommit } -Index: solr/distribution/source-release.gradle +Index: solr/distribution/build.gradle IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== -diff --git a/solr/distribution/source-release.gradle b/solr/distribution/source-release.gradle ---- a/solr/distribution/source-release.gradle (revision d998e63978abfedde3b75bab4ba6e1e78ddb5944) -+++ b/solr/distribution/source-release.gradle (date 1674639705718) -@@ -23,7 +23,6 @@ - description "Assemble source Solr artifact as a .tgz file." +diff --git a/solr/distribution/build.gradle b/solr/distribution/build.gradle +--- a/solr/distribution/build.gradle (revision 92c5515e2918c22513f7aa527d6c6db943150fea) ++++ b/solr/distribution/build.gradle (date 1681294983701) +@@ -70,7 +70,6 @@ - // Make sure no unstaged/ dirty files are present. -- dependsOn ":gitStatus", ":checkWorkingCopyClean" + files = objects.fileCollection() + [ +- tasks.assembleSourceTgz, + distTarTask, + ].each { dep -> + dependsOn dep +@@ -129,7 +128,6 @@ + }) - ext { - destination = file("${buildDir}/packages/solr-${version}-src.tgz") + from tasks.prepareGitRev +- from tasks.assembleSourceTgz + from distTarTask + + from tasks.computeChecksums Modified: skip-failing-test.patch =================================================================== --- skip-failing-test.patch 2023-05-15 15:18:08 UTC (rev 1461832) +++ skip-failing-test.patch 2023-05-15 15:32:43 UTC (rev 1461833) @@ -1,6 +1,11 @@ +Index: solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== diff --git a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java ---- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java (revision a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26) -+++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java (date 1668161796366) +--- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java (revision 6ef1f55660ce83a2ef673d917fd6898ca7b9a9ef) ++++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java (date 1681130275284) @@ -38,8 +38,10 @@ import org.apache.solr.search.SolrReturnFields; import org.junit.AfterClass; Modified: support-reproducible-builds.patch =================================================================== --- support-reproducible-builds.patch 2023-05-15 15:18:08 UTC (rev 1461832) +++ support-reproducible-builds.patch 2023-05-15 15:32:43 UTC (rev 1461833) @@ -1,5 +1,22 @@ -Subject: [PATCH] support-reproducible-builds +Subject: [PATCH] allow system gradle --- +Index: gradle/globals.gradle +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/gradle/globals.gradle b/gradle/globals.gradle +--- a/gradle/globals.gradle (revision 92c5515e2918c22513f7aa527d6c6db943150fea) ++++ b/gradle/globals.gradle (date 1681294916077) +@@ -170,4 +170,8 @@ + // anything starting with "JENKINS_" or "HUDSON_": Jenkins/Hudson (https://jenkins.thetaphi.de/env-vars.html/) + isCIBuild = System.getenv().keySet().find { it ==~ /(?i)((JENKINS|HUDSON)(_\w+)?|CI)/ } != null + } ++ tasks.withType(AbstractArchiveTask).configureEach { ++ preserveFileTimestamps = false ++ reproducibleFileOrder = true ++ } + } Index: gradle/java/jar-manifest.gradle IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP @@ -6,8 +23,8 @@ <+>UTF-8 =================================================================== diff --git a/gradle/java/jar-manifest.gradle b/gradle/java/jar-manifest.gradle ---- a/gradle/java/jar-manifest.gradle (revision d998e63978abfedde3b75bab4ba6e1e78ddb5944) -+++ b/gradle/java/jar-manifest.gradle (date 1674640403290) +--- a/gradle/java/jar-manifest.gradle (revision 92c5515e2918c22513f7aa527d6c6db943150fea) ++++ b/gradle/java/jar-manifest.gradle (date 1681294916075) @@ -46,7 +46,7 @@ } else { def sysProps = System.properties @@ -17,20 +34,3 @@ } } -Index: gradle/globals.gradle -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/gradle/globals.gradle b/gradle/globals.gradle ---- a/gradle/globals.gradle (revision d998e63978abfedde3b75bab4ba6e1e78ddb5944) -+++ b/gradle/globals.gradle (date 1674639757849) -@@ -170,4 +170,8 @@ - // anything starting with "JENKINS_" or "HUDSON_": Jenkins/Hudson (https://jenkins.thetaphi.de/env-vars.html/) - isCIBuild = System.getenv().keySet().find { it ==~ /(?i)((JENKINS|HUDSON)(_\w+)?|CI)/ } != null - } -+ tasks.withType(AbstractArchiveTask).configureEach { -+ preserveFileTimestamps = false -+ reproducibleFileOrder = true -+ } - }
