You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2019/12/13 12:31:33 UTC
[lucene-solr] branch gradle-master updated (a392a83 -> 4500f0e)
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a change to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from a392a83 Add support for validating the presence of licenses and notices.
add c406898 Correct regexes normalizing jar filenames so that the resulting licenses are consistent with gradle (which will use proper artifact name, not a chain of regexes).
add e155649 SOLR-13975: Make sure the stall time is adjusted up when an unusually long poll time is configured.
add 3ba0054 SOLR-14048: Improve Hadoop test sanity checks
add a6e7c77 SOLR-14064: remove some hadoop brain damage from build environment
add f083f40 SOLR-14076: clean up static fields leak in nightly-only test
new 035cede Merge remote-tracking branch 'origin/master' into gradle-master
new f97c276 Merge master changes to solr tests policy.
new 73e8b49 Align versions with ant build.
new 517261d LUCENE-9092: Upgrade randomizedtesting to 2.7.5 and Carrot2 to 3.16.2
new 528a2ec LUCENE-9092: Upgrade randomizedtesting to 2.7.5 and Carrot2 to 3.16.2 (follow-up)
new 25fc048 Working jar checksums and aligned with ant build.
new 4500f0e Consolidating versions between gradle and ant.
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 3 +-
gradle/ant-compat/force-versions.gradle | 11 +++++
gradle/ant-compat/misc.gradle | 12 ------
gradle/testing/policies/solr-tests.policy | 9 ----
gradle/validation/jar-checks.gradle | 48 +++++++++++++++++++---
lucene/common-build.xml | 1 -
lucene/ivy-versions.properties | 4 +-
.../randomizedtesting-runner-2.7.2.jar.sha1 | 1 -
.../randomizedtesting-runner-2.7.5.jar.sha1 | 1 +
lucene/tools/junit4/solr-tests.policy | 7 ----
solr/CHANGES.txt | 2 +-
solr/core/build.gradle | 4 +-
.../src/test/org/apache/hadoop/fs/FileUtil.java | 1 +
.../src/test/org/apache/hadoop/fs/HardLink.java | 1 +
.../org/apache/hadoop/fs/RawLocalFileSystem.java | 2 +
.../datanode/fsdataset/impl/BlockPoolSlice.java | 4 +-
.../server/namenode/NameNodeResourceChecker.java | 2 +
.../test/org/apache/hadoop/http/HttpServer2.java | 2 +
.../src/test/org/apache/hadoop/package-info.java | 39 ++++++++++++++++++
.../test/org/apache/hadoop/util/DiskChecker.java | 2 +
.../SearchRateTriggerIntegrationTest.java | 6 +++
.../org/apache/solr/cloud/hdfs/HdfsTestUtil.java | 29 +++++++++++++
solr/licenses/carrot2-mini-3.16.0.jar.sha1 | 1 -
solr/licenses/carrot2-mini-3.16.2.jar.sha1 | 1 +
solr/licenses/junit4-ant-2.7.2.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.7.5.jar.sha1 | 1 +
.../randomizedtesting-runner-2.7.2.jar.sha1 | 1 -
.../randomizedtesting-runner-2.7.5.jar.sha1 | 1 +
solr/solrj/build.gradle | 4 +-
.../impl/ConcurrentUpdateHttp2SolrClient.java | 11 ++++-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 10 ++++-
versions.lock | 14 +++----
versions.props | 3 +-
33 files changed, 179 insertions(+), 60 deletions(-)
create mode 100644 gradle/ant-compat/force-versions.gradle
delete mode 100644 lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1
create mode 100644 lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1
create mode 100644 solr/core/src/test/org/apache/hadoop/package-info.java
delete mode 100644 solr/licenses/carrot2-mini-3.16.0.jar.sha1
create mode 100644 solr/licenses/carrot2-mini-3.16.2.jar.sha1
delete mode 100644 solr/licenses/junit4-ant-2.7.2.jar.sha1
create mode 100644 solr/licenses/junit4-ant-2.7.5.jar.sha1
delete mode 100644 solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1
create mode 100644 solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1
[lucene-solr] 05/07: LUCENE-9092: Upgrade randomizedtesting to
2.7.5 and Carrot2 to 3.16.2 (follow-up)
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 528a2ecb56f75dbda45082f0cff132cd719a7628
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 13 12:12:11 2019 +0100
LUCENE-9092: Upgrade randomizedtesting to 2.7.5 and Carrot2 to 3.16.2 (follow-up)
---
solr/CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0e26813..5e2a014 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -23,7 +23,7 @@ Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this r
Versions of Major Components
---------------------
Apache Tika 1.19.1
-Carrot2 3.16.0
+Carrot2 3.16.2
Velocity 2.0 and Velocity Tools 3.0
Apache ZooKeeper 3.5.5
Jetty 9.4.19.v20190610
[lucene-solr] 01/07: Merge remote-tracking branch 'origin/master'
into gradle-master
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 035cede6b872d4a34d150d3b7120289879227502
Merge: a392a83 f083f40
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 13 10:51:14 2019 +0100
Merge remote-tracking branch 'origin/master' into gradle-master
lucene/common-build.xml | 1 -
lucene/tools/junit4/solr-tests.policy | 7 ----
.../src/test/org/apache/hadoop/fs/FileUtil.java | 1 +
.../src/test/org/apache/hadoop/fs/HardLink.java | 1 +
.../org/apache/hadoop/fs/RawLocalFileSystem.java | 2 ++
.../datanode/fsdataset/impl/BlockPoolSlice.java | 4 ++-
.../server/namenode/NameNodeResourceChecker.java | 2 ++
.../test/org/apache/hadoop/http/HttpServer2.java | 2 ++
.../src/test/org/apache/hadoop/package-info.java | 39 ++++++++++++++++++++++
.../test/org/apache/hadoop/util/DiskChecker.java | 2 ++
.../SearchRateTriggerIntegrationTest.java | 6 ++++
.../org/apache/solr/cloud/hdfs/HdfsTestUtil.java | 29 ++++++++++++++++
.../impl/ConcurrentUpdateHttp2SolrClient.java | 11 ++++--
.../solrj/impl/ConcurrentUpdateSolrClient.java | 10 +++++-
14 files changed, 105 insertions(+), 12 deletions(-)
[lucene-solr] 03/07: Align versions with ant build.
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 73e8b49f0d077e4c85d3d5c726d1acc0c6d2ac69
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 13 12:01:26 2019 +0100
Align versions with ant build.
---
build.gradle | 3 ++-
gradle/ant-compat/force-versions.gradle | 11 +++++++++++
gradle/ant-compat/misc.gradle | 12 ------------
gradle/validation/jar-checks.gradle | 7 ++++---
versions.lock | 12 ++++++------
versions.props | 2 +-
6 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/build.gradle b/build.gradle
index c71782d..ed230e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
plugins {
id "base"
- id "com.palantir.consistent-versions" version "1.12.4"
+ id "com.palantir.consistent-versions" version "1.13.1"
id "com.gradle.build-scan" version "3.0"
id 'de.thetaphi.forbiddenapis' version '2.7' apply false
}
@@ -50,6 +50,7 @@ apply from: file('gradle/help.gradle')
// Ant-compatibility layer. ALL OF THESE SHOULD BE GONE at some point. They are
// here so that we can coexist with current ant build but they are indicative
// of potential problems with the build conventions, dependencies, etc.
+apply from: file('gradle/ant-compat/force-versions.gradle')
apply from: file('gradle/ant-compat/folder-layout.gradle')
apply from: file('gradle/ant-compat/misc.gradle')
apply from: file('gradle/ant-compat/resolve.gradle')
diff --git a/gradle/ant-compat/force-versions.gradle b/gradle/ant-compat/force-versions.gradle
new file mode 100644
index 0000000..92050f7
--- /dev/null
+++ b/gradle/ant-compat/force-versions.gradle
@@ -0,0 +1,11 @@
+
+// Force versions of certain components to align them with ant build.
+
+subprojects {
+ plugins.withType(JavaPlugin) {
+ dependencies {
+ implementation enforcedPlatform('org.slf4j:slf4j-api:1.7.24')
+ implementation enforcedPlatform('commons-logging:commons-logging:1.1.3')
+ }
+ }
+}
diff --git a/gradle/ant-compat/misc.gradle b/gradle/ant-compat/misc.gradle
index 7ffadb2..277b41d 100644
--- a/gradle/ant-compat/misc.gradle
+++ b/gradle/ant-compat/misc.gradle
@@ -27,16 +27,4 @@ configure(project(":lucene:benchmark")) {
}
}
-// lucene:replicator has httpclient dependency with transitive commons-logging:1.2 but currently
-// requires 1.1.2. This commons-logging should be removed entirely and replaced with slf4j-to-*
-// redirector.
-configure(project(":lucene:replicator")) {
- plugins.withType(JavaPlugin) {
- configurations.all {
- resolutionStrategy {
- force 'commons-logging:commons-logging:1.1.3'
- }
- }
- }
-}
diff --git a/gradle/validation/jar-checks.gradle b/gradle/validation/jar-checks.gradle
index de29170..c6ac5a5 100644
--- a/gradle/validation/jar-checks.gradle
+++ b/gradle/validation/jar-checks.gradle
@@ -7,6 +7,9 @@
import org.apache.commons.codec.digest.DigestUtils
import org.apache.commons.codec.digest.MessageDigestAlgorithms
+// This should be true.
+def failOnError = false
+
buildscript {
repositories {
mavenCentral()
@@ -91,8 +94,6 @@ subprojects {
}
}
- def failOnError = false
-
// Verifies that each JAR has a corresponding checksum and that it matches actual JAR available for this dependency.
task validateJarChecksums() {
group = 'Dependency validation'
@@ -204,4 +205,4 @@ configure(project(":solr:solr-ref-guide")) {
[validateJarLicenses, validateJarChecksums].each { task ->
task.enabled = false
}
-}
\ No newline at end of file
+}
diff --git a/versions.lock b/versions.lock
index 0dc5c2a..6dffa9e 100644
--- a/versions.lock
+++ b/versions.lock
@@ -24,7 +24,7 @@ com.google.code.findbugs:jsr305:3.0.2 (1 constraints: 170aecb4)
com.google.errorprone:error_prone_annotations:2.1.3 (1 constraints: 180aebb4)
com.google.guava:guava:25.1-jre (1 constraints: 4a06b047)
com.google.j2objc:j2objc-annotations:1.1 (1 constraints: b609eba0)
-com.google.protobuf:protobuf-java:3.7.1 (1 constraints: 0d051036)
+com.google.protobuf:protobuf-java:3.6.1 (1 constraints: 0c050d36)
com.google.re2j:re2j:1.2 (1 constraints: a7041c2c)
com.googlecode.juniversalchardet:juniversalchardet:1.0.3 (1 constraints: 0605f335)
com.googlecode.mp4parser:isoparser:1.1.22 (1 constraints: 38052d3b)
@@ -51,7 +51,7 @@ commons-codec:commons-codec:1.11 (1 constraints: d704f230)
commons-collections:commons-collections:3.2.2 (1 constraints: 09050236)
commons-fileupload:commons-fileupload:1.3.3 (1 constraints: 0905fc35)
commons-io:commons-io:2.5 (2 constraints: be142680)
-commons-logging:commons-logging:1.2 (2 constraints: c8149e7f)
+commons-logging:commons-logging:1.1.3 (2 constraints: c8149e7f)
de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 0405f335)
io.dropwizard.metrics:metrics-core:4.0.5 (5 constraints: 204326bf)
io.dropwizard.metrics:metrics-graphite:4.0.5 (1 constraints: 0b050436)
@@ -202,9 +202,9 @@ org.ow2.asm:asm-commons:5.1 (1 constraints: aa04272c)
org.restlet.jee:org.restlet:2.3.0 (2 constraints: e3159ee6)
org.restlet.jee:org.restlet.ext.servlet:2.3.0 (1 constraints: 0705fe35)
org.rrd4j:rrd4j:3.5 (1 constraints: ac04252c)
-org.slf4j:jcl-over-slf4j:1.7.25 (1 constraints: 4005473b)
-org.slf4j:slf4j-api:1.7.25 (19 constraints: aaff8c21)
-org.slf4j:slf4j-simple:1.7.25 (1 constraints: 4005473b)
+org.slf4j:jcl-over-slf4j:1.7.24 (1 constraints: 4005473b)
+org.slf4j:slf4j-api:1.7.24 (19 constraints: a7ff2521)
+org.slf4j:slf4j-simple:1.7.24 (1 constraints: 4005473b)
org.tallison:jmatio:1.5 (1 constraints: aa041f2c)
org.tukaani:xz:1.8 (1 constraints: ad04222c)
ua.net.nlp:morfologik-ukrainian-search:3.9.0 (1 constraints: 0e051536)
@@ -227,4 +227,4 @@ org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)
org.locationtech.jts:jts-core:1.15.0 (1 constraints: 3905383b)
org.mockito:mockito-core:2.23.4 (1 constraints: 3d05403b)
org.objenesis:objenesis:2.6 (2 constraints: 5f0ffb79)
-org.slf4j:log4j-over-slf4j:1.7.25 (1 constraints: 4005473b)
+org.slf4j:log4j-over-slf4j:1.7.24 (1 constraints: 4005473b)
diff --git a/versions.props b/versions.props
index 905c619..25ffdf0 100644
--- a/versions.props
+++ b/versions.props
@@ -10,7 +10,7 @@ com.github.ben-manes.caffeine:caffeine=2.8.0
com.github.virtuald:curvesapi=1.04
com.github.zafarkhaja:java-semver=0.9.0
com.google.guava:guava=25.1-jre
-com.google.protobuf:protobuf-java=3.7.1
+com.google.protobuf:protobuf-java=3.6.1
com.google.re2j:re2j=1.2
com.googlecode.juniversalchardet:juniversalchardet=1.0.3
com.googlecode.mp4parser:isoparser=1.1.22
[lucene-solr] 04/07: LUCENE-9092: Upgrade randomizedtesting to
2.7.5 and Carrot2 to 3.16.2
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 517261dcff8d93a949f6b162b5232c7700ad2d29
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 13 12:11:38 2019 +0100
LUCENE-9092: Upgrade randomizedtesting to 2.7.5 and Carrot2 to 3.16.2
---
lucene/ivy-versions.properties | 4 ++--
lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1 | 1 -
lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1 | 1 +
solr/licenses/carrot2-mini-3.16.0.jar.sha1 | 1 -
solr/licenses/carrot2-mini-3.16.2.jar.sha1 | 1 +
solr/licenses/junit4-ant-2.7.2.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.7.5.jar.sha1 | 1 +
solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1 | 1 -
solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1 | 1 +
9 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 160a4cd..d096153 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -4,7 +4,7 @@
/com.adobe.xmp/xmpcore = 5.1.3
-com.carrotsearch.randomizedtesting.version = 2.7.2
+com.carrotsearch.randomizedtesting.version = 2.7.5
/com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version}
/com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version}
@@ -244,7 +244,7 @@ org.bouncycastle.version = 1.60
/org.carrot2.attributes/attributes-binder = 1.3.3
/org.carrot2.shaded/carrot2-guava = 18.0
-/org.carrot2/carrot2-mini = 3.16.0
+/org.carrot2/carrot2-mini = 3.16.2
org.carrot2.morfologik.version = 2.1.5
/org.carrot2/morfologik-fsa = ${org.carrot2.morfologik.version}
diff --git a/lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1
deleted file mode 100644
index 9eeaf24..0000000
--- a/lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-84ed6b5f70906f9ef173db67ccde657b43ea60df
diff --git a/lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1
new file mode 100644
index 0000000..197a8c0
--- /dev/null
+++ b/lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1
@@ -0,0 +1 @@
+967e89a9a46a5b15ce8bef199f01be4830af1a31
diff --git a/solr/licenses/carrot2-mini-3.16.0.jar.sha1 b/solr/licenses/carrot2-mini-3.16.0.jar.sha1
deleted file mode 100644
index 0b34d73..0000000
--- a/solr/licenses/carrot2-mini-3.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6bb27fd0dfe24a5671d9751a943728a54be48ed7
diff --git a/solr/licenses/carrot2-mini-3.16.2.jar.sha1 b/solr/licenses/carrot2-mini-3.16.2.jar.sha1
new file mode 100644
index 0000000..3aaeaa1
--- /dev/null
+++ b/solr/licenses/carrot2-mini-3.16.2.jar.sha1
@@ -0,0 +1 @@
+decabb42b88a8d40c1894984f4af8adb833f766b
diff --git a/solr/licenses/junit4-ant-2.7.2.jar.sha1 b/solr/licenses/junit4-ant-2.7.2.jar.sha1
deleted file mode 100644
index f51d140..0000000
--- a/solr/licenses/junit4-ant-2.7.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b9e4fce45b3ee7bb14c5b72804dc1e483e61340d
diff --git a/solr/licenses/junit4-ant-2.7.5.jar.sha1 b/solr/licenses/junit4-ant-2.7.5.jar.sha1
new file mode 100644
index 0000000..e14ef45
--- /dev/null
+++ b/solr/licenses/junit4-ant-2.7.5.jar.sha1
@@ -0,0 +1 @@
+e044cdd1aeaafe12df7808a3d9295a03a2717f12
diff --git a/solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1
deleted file mode 100644
index 9eeaf24..0000000
--- a/solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-84ed6b5f70906f9ef173db67ccde657b43ea60df
diff --git a/solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1
new file mode 100644
index 0000000..197a8c0
--- /dev/null
+++ b/solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1
@@ -0,0 +1 @@
+967e89a9a46a5b15ce8bef199f01be4830af1a31
[lucene-solr] 06/07: Working jar checksums and aligned with ant
build.
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 25fc0487a19f78a272b73a7dc1137adf22df42d7
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 13 12:12:29 2019 +0100
Working jar checksums and aligned with ant build.
---
gradle/validation/jar-checks.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle/validation/jar-checks.gradle b/gradle/validation/jar-checks.gradle
index c6ac5a5..29f14d3 100644
--- a/gradle/validation/jar-checks.gradle
+++ b/gradle/validation/jar-checks.gradle
@@ -7,8 +7,8 @@
import org.apache.commons.codec.digest.DigestUtils
import org.apache.commons.codec.digest.MessageDigestAlgorithms
-// This should be true.
-def failOnError = false
+// This should be false only for debugging.
+def failOnError = true
buildscript {
repositories {
[lucene-solr] 07/07: Consolidating versions between gradle and ant.
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 4500f0e3272030544a92e1f3cbf35742a75b8092
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 13 13:31:23 2019 +0100
Consolidating versions between gradle and ant.
---
gradle/validation/jar-checks.gradle | 41 +++++++++++++++++++++++++++++++++++--
solr/core/build.gradle | 4 +---
solr/solrj/build.gradle | 4 +++-
versions.lock | 6 ++----
versions.props | 1 -
5 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/gradle/validation/jar-checks.gradle b/gradle/validation/jar-checks.gradle
index 29f14d3..c642ece 100644
--- a/gradle/validation/jar-checks.gradle
+++ b/gradle/validation/jar-checks.gradle
@@ -55,12 +55,15 @@ subprojects {
jarValidation
}
- // For Java projects, add runtime and classpath to jarValidation
+ // For Java projects, add all dependencies from the following configurations
+ // to jar validation
plugins.withType(JavaPlugin) {
configurations {
jarValidation {
extendsFrom runtimeClasspath
extendsFrom compileClasspath
+ extendsFrom testRuntimeClasspath
+ extendsFrom testCompileClasspath
}
}
}
@@ -88,7 +91,10 @@ subprojects {
jarName: file.toPath().getFileName().toString(),
path: file,
module: resolvedArtifact.moduleVersion,
- checksum: new DigestUtils(MessageDigestAlgorithms.SHA_1).digestAsHex(file)
+ checksum: new DigestUtils(MessageDigestAlgorithms.SHA_1).digestAsHex(file),
+ // We keep count of the files referenced by this dependency (sha, license, notice, etc.)
+ // so that we can determine unused files later on.
+ referencedFiles: []
]
}
}
@@ -107,6 +113,7 @@ subprojects {
if (!expectedChecksumFile.exists()) {
errors << "Dependency checksum missing ('${dep.module}'), expected it at: ${expectedChecksumFile}"
} else {
+ dep.referencedFiles += expectedChecksumFile
def expected = expectedChecksumFile.getText("UTF-8").trim()
def actual = dep.checksum.trim()
if (expected.compareToIgnoreCase(actual) != 0) {
@@ -161,6 +168,7 @@ subprojects {
errors << "Multiple license files matching for ('${dep.module}'): ${found.join(", ")}"
} else {
def licenseFile = found.get(0)
+ dep.referencedFiles += licenseFile
def m = (licenseFile.name =~ /LICENSE-(.+)\.txt$/)
if (!m) throw new GradleException("License file name doesn't contain license type?: ${licenseFile.name}")
@@ -174,6 +182,7 @@ subprojects {
// Look for sibling NOTICE file.
def noticeFile = file(licenseFile.path.replaceAll(/\-LICENSE-.+/, "-NOTICE.txt"))
if (noticeFile.exists()) {
+ dep.referencedFiles += noticeFile
logger.log(LogLevel.INFO, "Dependency notice file OK ('${dep.module}'): " + noticeFile)
} else if (!licenseType.noticeOptional) {
errors << "Notice file missing for ('${dep.module}'), expected it at: ${noticeFile}"
@@ -200,6 +209,34 @@ subprojects {
check.dependsOn(validateJars)
}
+// Check for dangling files in the licenses folder.
+configure([project(":solr"), project(":lucene"), ]) {
+ def validationTasks = subprojects.collect { it.tasks.matching { it.name == "validateJars" } }
+
+ task validateUnusedLicenseFiles() {
+ dependsOn validationTasks
+
+ doFirst {
+ def allReferenced = validationTasks.collectMany { task ->
+ task.project.jarInfos.collectMany { it.referencedFiles }
+ }
+ .collect { it.toString() }
+
+ def allExisting = licensesDir.listFiles()
+ .collect { it.toString() }
+ .collect { it.toString() }
+
+ def dangling = (allExisting - allReferenced)
+
+ if (dangling) {
+ gradle.buildFinished {
+ logger.warn("WARNING: there were unreferenced files under license folder:\n - ${dangling.join("\n - ")}")
+ }
+ }
+ }
+ }
+}
+
// Disable validation for these projects (should it be disabled?)
configure(project(":solr:solr-ref-guide")) {
[validateJarLicenses, validateJarChecksums].each { task ->
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 2ddddb4..09af2b9 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -117,14 +117,12 @@ dependencies {
testImplementation ('org.apache.kerby:kerb-admin') { transitive = false }
testImplementation ('org.apache.kerby:kerby-kdc') { transitive = false }
- testImplementation ('com.sun.jersey:jersey-servlet:1.19.4') { transitive = false }
+ testImplementation ('com.sun.jersey:jersey-servlet') { transitive = false }
testImplementation 'com.google.protobuf:protobuf-java'
testImplementation 'commons-logging:commons-logging'
testImplementation('org.mockito:mockito-core', {
exclude group: "net.bytebuddy", module: "byte-buddy-agent"
})
-
- testRuntimeOnly 'org.slf4j:log4j-over-slf4j'
}
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index c77d2dc..48ddd65 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -42,7 +42,9 @@ dependencies {
testImplementation project(':solr:test-framework')
testImplementation 'org.eclipse.jetty:jetty-webapp'
- testImplementation 'org.eclipse.jetty:jetty-alpn-java-server'
+ testImplementation ('org.eclipse.jetty:jetty-alpn-java-server', {
+ exclude group: "org.eclipse.jetty.alpn", module: "alpn-api"
+ })
testImplementation 'org.restlet.jee:org.restlet.ext.servlet'
testImplementation 'org.objenesis:objenesis'
testImplementation('org.mockito:mockito-core', {
diff --git a/versions.lock b/versions.lock
index 6dffa9e..ba99073 100644
--- a/versions.lock
+++ b/versions.lock
@@ -179,7 +179,6 @@ org.eclipse.jetty:jetty-servlets:9.4.19.v20190610 (1 constraints: 8007517d)
org.eclipse.jetty:jetty-util:9.4.19.v20190610 (7 constraints: 77648009)
org.eclipse.jetty:jetty-webapp:9.4.19.v20190610 (2 constraints: 72178fc0)
org.eclipse.jetty:jetty-xml:9.4.19.v20190610 (3 constraints: 56274720)
-org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715 (1 constraints: 6513848a)
org.eclipse.jetty.http2:http2-client:9.4.19.v20190610 (2 constraints: 4d1ff83f)
org.eclipse.jetty.http2:http2-common:9.4.19.v20190610 (3 constraints: 242bc31f)
org.eclipse.jetty.http2:http2-hpack:9.4.19.v20190610 (2 constraints: 50198f5c)
@@ -203,7 +202,7 @@ org.restlet.jee:org.restlet:2.3.0 (2 constraints: e3159ee6)
org.restlet.jee:org.restlet.ext.servlet:2.3.0 (1 constraints: 0705fe35)
org.rrd4j:rrd4j:3.5 (1 constraints: ac04252c)
org.slf4j:jcl-over-slf4j:1.7.24 (1 constraints: 4005473b)
-org.slf4j:slf4j-api:1.7.24 (19 constraints: a7ff2521)
+org.slf4j:slf4j-api:1.7.24 (18 constraints: 66f4afd8)
org.slf4j:slf4j-simple:1.7.24 (1 constraints: 4005473b)
org.tallison:jmatio:1.5 (1 constraints: aa041f2c)
org.tukaani:xz:1.8 (1 constraints: ad04222c)
@@ -211,7 +210,7 @@ ua.net.nlp:morfologik-ukrainian-search:3.9.0 (1 constraints: 0e051536)
xerces:xercesImpl:2.9.1 (2 constraints: f613d869)
[Test dependencies]
-com.sun.jersey:jersey-servlet:1.19.4 (1 constraints: 4105483b)
+com.sun.jersey:jersey-servlet:1.19 (1 constraints: df04fa30)
net.bytebuddy:byte-buddy:1.9.3 (2 constraints: 2510faaf)
org.apache.derby:derby:10.9.1.0 (1 constraints: 9b054946)
org.apache.hadoop:hadoop-hdfs:3.2.0 (1 constraints: 07050036)
@@ -227,4 +226,3 @@ org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)
org.locationtech.jts:jts-core:1.15.0 (1 constraints: 3905383b)
org.mockito:mockito-core:2.23.4 (1 constraints: 3d05403b)
org.objenesis:objenesis:2.6 (2 constraints: 5f0ffb79)
-org.slf4j:log4j-over-slf4j:1.7.24 (1 constraints: 4005473b)
diff --git a/versions.props b/versions.props
index 25ffdf0..72c70b9 100644
--- a/versions.props
+++ b/versions.props
@@ -22,7 +22,6 @@ com.lmax:disruptor=3.4.2
com.pff:java-libpst=0.8.1
com.rometools:*=1.5.1
com.sun.jersey:*=1.19
-com.sun.jersey:jersey-json=1.19.4
com.sun.mail:*=1.5.1
com.tdunning:t-digest=3.1
com.vaadin.external.google:android-json=0.0.20131108.vaadin1
[lucene-solr] 02/07: Merge master changes to solr tests policy.
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit f97c276a813f14824ad136e1e15dcfd0a433b33f
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 13 10:53:59 2019 +0100
Merge master changes to solr tests policy.
---
gradle/testing/policies/solr-tests.policy | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/gradle/testing/policies/solr-tests.policy b/gradle/testing/policies/solr-tests.policy
index cd150d3..103d21d 100644
--- a/gradle/testing/policies/solr-tests.policy
+++ b/gradle/testing/policies/solr-tests.policy
@@ -29,18 +29,9 @@ grant {
permission java.io.FilePermission "${java.io.tmpdir}", "read,write";
permission java.io.FilePermission "${java.io.tmpdir}${/}-", "read,write,delete";
permission java.io.FilePermission "${tests.linedocsfile}", "read";
-
// hadoop
- // permission java.io.FilePermission "${ant.library.dir}${/}-", "read";
- // permission java.io.FilePermission "${user.home}${/}.ant${/}lib${/}-", "read";
-
permission java.io.FilePermission "${user.home}${/}hadoop-metrics2.properties", "read";
permission java.io.FilePermission "${user.home}${/}hadoop-metrics2-namenode.properties", "read";
- // kerberos
- permission java.io.FilePermission "${user.home}${/}.java.login.config", "read";
- // SolrTestCaseJ4 explicitly uses these
- permission java.io.FilePermission "/dev/./urandom", "read";
- permission java.io.FilePermission "/dev/random", "read";
// DirectoryFactoryTest messes with these (wtf?)
permission java.io.FilePermission "/tmp/inst1/conf/solrcore.properties", "read";
permission java.io.FilePermission "/path/to/myinst/conf/solrcore.properties", "read";