You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/06/16 23:26:09 UTC
[lucene-solr] branch jira/SOLR-13452_gradle_4 updated: SOLR-13452:
Yet more work on dependencies and missingDependencies task.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_4
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/SOLR-13452_gradle_4 by this push:
new a132c37 SOLR-13452: Yet more work on dependencies and missingDependencies task.
a132c37 is described below
commit a132c37fdfcadee89e2d102cc6d41786c5bc289c
Author: markrmiller <ma...@apache.org>
AuthorDate: Sun Jun 16 18:25:26 2019 -0500
SOLR-13452: Yet more work on dependencies and missingDependencies task.
---
.../org/apache/lucene/gradle/MissingDeps.groovy | 6 ++---
solr/contrib/analysis-extras/build.gradle | 17 +++++++++-----
solr/contrib/analytics/build.gradle | 11 +++++++--
solr/contrib/clustering/build.gradle | 4 +---
solr/contrib/dataimporthandler-extras/build.gradle | 6 ++++-
solr/contrib/dataimporthandler/build.gradle | 4 +---
solr/contrib/extraction/build.gradle | 19 +++++++++++-----
solr/contrib/langid/build.gradle | 9 ++++++--
solr/contrib/ltr/build.gradle | 4 ++++
solr/contrib/prometheus-exporter/build.gradle | 26 +++++++++++++---------
solr/contrib/velocity/build.gradle | 25 ++++++++++++---------
solr/core/build.gradle | 3 +--
solr/test-framework/build.gradle | 4 +---
versions.lock | 23 +++++++++++--------
14 files changed, 101 insertions(+), 60 deletions(-)
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/MissingDeps.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/MissingDeps.groovy
index b9c7835..36d7410 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/MissingDeps.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/MissingDeps.groovy
@@ -246,10 +246,10 @@ class MissingDeps extends DefaultTask {
return topLvlProject
}
- public static void addExclusionsFrom(Project fromProject, Project toProject) {
- toProject.evaluationDependsOn(fromProject.path)
+ public void addExclusionsFrom(Project fromProject) {
+ project.evaluationDependsOn(fromProject.path)
- MissingDeps to = toProject.missingDeps
+ MissingDeps to = project.missingDeps
Set<String> depExcludes = fromProject.missingDeps.getExportedDepExcludes()
for (String exclude : depExcludes) {
diff --git a/solr/contrib/analysis-extras/build.gradle b/solr/contrib/analysis-extras/build.gradle
index 3c5af02..0cb15a0 100644
--- a/solr/contrib/analysis-extras/build.gradle
+++ b/solr/contrib/analysis-extras/build.gradle
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
apply plugin: 'java-library'
apply plugin: 'maven-publish'
apply plugin: org.apache.lucene.gradle.PartOfDist
@@ -31,14 +31,19 @@ dependencies {
implementation project(':lucene:analysis:lucene-analyzers-morfologik')
implementation project(':lucene:analysis:lucene-analyzers-opennlp')
- implementation ('org.slf4j:slf4j-api') { transitive = false }
- implementation ('commons-io:commons-io') { transitive = false }
+ implementation ('org.slf4j:slf4j-api')
+ implementation ('commons-io:commons-io')
implementation ('com.google.guava:guava')
- implementation ('commons-codec:commons-codec') { transitive = false }
+ implementation ('commons-codec:commons-codec')
testImplementation project(path: ':lucene:analysis:lucene-analyzers-common', configuration: 'testOutput')
testImplementation project(path: ':solr:contrib:solr-contrib-dataimporthandler', configuration: 'testOutput')
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
-
-}
\ No newline at end of file
+
+}
+
+missingDeps {
+ addExclusionsFrom(project(':solr:solr-core')) // add solr-core exclusions
+ addExclusionsFrom(project(':lucene:analysis:lucene-analyzers-opennlp'))
+}
diff --git a/solr/contrib/analytics/build.gradle b/solr/contrib/analytics/build.gradle
index 865cf67..0c3f350 100644
--- a/solr/contrib/analytics/build.gradle
+++ b/solr/contrib/analytics/build.gradle
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
apply plugin: 'java-library'
apply plugin: 'maven-publish'
apply plugin: org.apache.lucene.gradle.PartOfDist
@@ -94,4 +94,11 @@ dependencies {
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
-}
\ No newline at end of file
+}
+
+missingDeps {
+
+ // add solr-core exclusions
+ addExclusionsFrom(project(':solr:solr-core'))
+}
+
diff --git a/solr/contrib/clustering/build.gradle b/solr/contrib/clustering/build.gradle
index 05741fd..885c227 100644
--- a/solr/contrib/clustering/build.gradle
+++ b/solr/contrib/clustering/build.gradle
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import org.apache.lucene.gradle.MissingDeps
apply plugin: 'java-library'
apply plugin: 'maven-publish'
@@ -45,5 +43,5 @@ missingDeps {
classExclude 'org\\.xmlpull\\.v1\\.XmlPullParser.*' // currently not brought in, wanted by simple-xml
// add solr-core exclusions
- MissingDeps.addExclusionsFrom(project(':solr:solr-core'), project)
+ addExclusionsFrom(project(':solr:solr-core'))
}
diff --git a/solr/contrib/dataimporthandler-extras/build.gradle b/solr/contrib/dataimporthandler-extras/build.gradle
index 2a30c4d..5002b95 100644
--- a/solr/contrib/dataimporthandler-extras/build.gradle
+++ b/solr/contrib/dataimporthandler-extras/build.gradle
@@ -38,4 +38,8 @@ dependencies {
testImplementation project(path: ':solr:contrib:solr-contrib-dataimporthandler', configuration: 'testOutput')
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
-}
\ No newline at end of file
+}
+
+missingDeps {
+ addExclusionsFrom(project(':solr:contrib:solr-contrib-extraction'))
+}
diff --git a/solr/contrib/dataimporthandler/build.gradle b/solr/contrib/dataimporthandler/build.gradle
index fe08abf..a0f59ec 100644
--- a/solr/contrib/dataimporthandler/build.gradle
+++ b/solr/contrib/dataimporthandler/build.gradle
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import org.apache.lucene.gradle.MissingDeps
apply plugin: 'java-library'
apply plugin: 'maven-publish'
@@ -66,6 +64,6 @@ missingDeps {
classExclude 'org\\.xmlpull\\.v1\\.XmlPullParser.*' // currently not brought in, wanted by simple-xml
// add solr-core exclusions
- MissingDeps.addExclusionsFrom(project(':solr:solr-core'), project)
+ addExclusionsFrom(project(':solr:solr-core'))
}
diff --git a/solr/contrib/extraction/build.gradle b/solr/contrib/extraction/build.gradle
index d16a088..060b2ec 100644
--- a/solr/contrib/extraction/build.gradle
+++ b/solr/contrib/extraction/build.gradle
@@ -26,7 +26,7 @@ dependencies {
implementation project(':solr:solr-solrj')
implementation project(':lucene:analysis:lucene-analyzers-common')
- implementation ('org.slf4j:slf4j-api') { transitive = false }
+ implementation ('org.slf4j:slf4j-api')
implementation ('org.apache.tika:tika-core') { transitive = false }
implementation ('org.apache.tika:tika-parsers') { transitive = false }
implementation ('org.apache.tika:tika-xmp') { transitive = false }
@@ -67,13 +67,22 @@ dependencies {
implementation ('org.tallison:jmatio') { transitive = false }
implementation ('com.epam:parso') { transitive = false }
implementation ('org.brotli:dec') { transitive = false }
- implementation ('com.ibm.icu:icu4j') { transitive = false }
+ implementation ('com.ibm.icu:icu4j')
implementation ('xerces:xercesImpl') { transitive = false }
- implementation ('commons-io:commons-io') { transitive = false }
- implementation ('commons-codec:commons-codec') { transitive = false }
+ implementation ('commons-io:commons-io')
+ implementation ('commons-codec:commons-codec')
implementation ('com.google.guava:guava')
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
-}
\ No newline at end of file
+}
+
+missingDeps {
+ depExclude '**/poi-ooxml-schemas*.dot' // we don't include many of these deps
+
+ classExclude 'javax\\.xml\\.bind\\.DatatypeConverter' // used by poi
+
+ addExclusionsFrom(project(':solr:solr-core')) // add solr-core exclusions
+}
+
diff --git a/solr/contrib/langid/build.gradle b/solr/contrib/langid/build.gradle
index bf008ed..d963852 100644
--- a/solr/contrib/langid/build.gradle
+++ b/solr/contrib/langid/build.gradle
@@ -32,8 +32,13 @@ dependencies {
implementation 'commons-io:commons-io'
implementation 'org.slf4j:slf4j-api'
implementation 'commons-codec:commons-codec'
- implementation'com.google.guava:guava'
+ implementation 'com.google.guava:guava'
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
-}
\ No newline at end of file
+}
+
+missingDeps {
+ addExclusionsFrom(project(':solr:solr-core')) // add solr-core exclusions
+ addExclusionsFrom(project(':lucene:analysis:lucene-analyzers-opennlp'))
+}
diff --git a/solr/contrib/ltr/build.gradle b/solr/contrib/ltr/build.gradle
index 18ae823..60e1a59 100644
--- a/solr/contrib/ltr/build.gradle
+++ b/solr/contrib/ltr/build.gradle
@@ -44,3 +44,7 @@ dependencies {
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
}
+
+missingDeps {
+ addExclusionsFrom(project(':solr:solr-core')) // add solr-core exclusions
+}
diff --git a/solr/contrib/prometheus-exporter/build.gradle b/solr/contrib/prometheus-exporter/build.gradle
index be8571d..9fbca7c 100644
--- a/solr/contrib/prometheus-exporter/build.gradle
+++ b/solr/contrib/prometheus-exporter/build.gradle
@@ -29,23 +29,27 @@ dependencies {
implementation ('io.prometheus:simpleclient') { transitive = false }
implementation ('io.prometheus:simpleclient_common') { transitive = false }
implementation ('io.prometheus:simpleclient_httpserver') { transitive = false }
- implementation ('com.fasterxml.jackson.core:jackson-core') { transitive = false }
- implementation ('com.fasterxml.jackson.core:jackson-databind') { transitive = false }
- implementation ('com.fasterxml.jackson.core:jackson-annotations') { transitive = false }
+ implementation ('com.fasterxml.jackson.core:jackson-core')
+ implementation ('com.fasterxml.jackson.core:jackson-databind')
+ implementation ('com.fasterxml.jackson.core:jackson-annotations')
implementation ('net.thisptr:jackson-jq') { transitive = false }
implementation ('net.sourceforge.argparse4j:argparse4j') { transitive = false }
- implementation ('org.slf4j:slf4j-api') { transitive = false }
+ implementation ('org.slf4j:slf4j-api')
implementation ('com.google.guava:guava')
- implementation ('org.apache.zookeeper:zookeeper') { transitive = false }
+ implementation ('org.apache.zookeeper:zookeeper')
implementation ('org.apache.zookeeper:zookeeper-jute')
- implementation ('commons-codec:commons-codec') { transitive = false }
- implementation ('commons-io:commons-io') { transitive = false }
- implementation ('org.apache.httpcomponents:httpclient') { transitive = false }
+ implementation ('commons-codec:commons-codec')
+ implementation ('commons-io:commons-io')
+ implementation ('org.apache.httpcomponents:httpclient')
- testImplementation ('org.apache.httpcomponents:httpcore') { transitive = false }
- testImplementation ('org.eclipse.jetty:jetty-servlet') { transitive = false }
+ testImplementation ('org.apache.httpcomponents:httpcore')
+ testImplementation ('org.eclipse.jetty:jetty-servlet')
testImplementation project(':solr:solr-test-framework')
testImplementation project(':lucene:lucene-test-framework')
-}
\ No newline at end of file
+}
+
+missingDeps {
+ addExclusionsFrom(project(':solr:solr-core')) // add solr-core exclusions
+}
diff --git a/solr/contrib/velocity/build.gradle b/solr/contrib/velocity/build.gradle
index 5aa8a53..ff017bf 100644
--- a/solr/contrib/velocity/build.gradle
+++ b/solr/contrib/velocity/build.gradle
@@ -25,17 +25,22 @@ dependencies {
implementation project(':solr:solr-core')
implementation project(':solr:solr-solrj')
- implementation ('commons-collections:commons-collections') { transitive = false }
- implementation ("org.apache.velocity:velocity-engine-core") { transitive = false }
- implementation ("org.apache.velocity.tools:velocity-tools-generic") { transitive = false }
- implementation ("org.apache.velocity.tools:velocity-tools-view") { transitive = false }
- implementation ("org.apache.velocity.tools:velocity-tools-view-jsp") { transitive = false }
- implementation ('commons-io:commons-io') { transitive = false }
- implementation ('com.google.guava:guava')
- implementation ('commons-codec:commons-codec') { transitive = false }
- implementation ('org.slf4j:slf4j-api') { transitive = false }
+ implementation 'org.slf4j:slf4j-api'
+ implementation 'commons-collections:commons-collections'
+ implementation 'org.apache.velocity:velocity-engine-core'
+ implementation 'org.apache.velocity.tools:velocity-tools-generic'
+ implementation 'org.apache.velocity.tools:velocity-tools-view'
+ implementation 'org.apache.velocity.tools:velocity-tools-view-jsp'
+ implementation 'commons-io:commons-io'
+ implementation 'com.google.guava:guava'
+ implementation 'commons-codec:commons-codec'
testImplementation project(':lucene:lucene-misc')
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
-}
\ No newline at end of file
+}
+
+missingDeps {
+ classExclude 'org\\.objectweb\\.asm.util\\.TraceClassVisitor' // from cglib
+ addExclusionsFrom(project(':solr:solr-core')) // add solr-core exclusions
+}
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index ce68dcf..0475960 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -16,7 +16,6 @@
*/
import org.apache.lucene.gradle.UnusedDeps
- import org.apache.lucene.gradle.MissingDeps
apply plugin: 'java-library'
apply plugin: 'maven-publish'
@@ -218,7 +217,7 @@ missingDeps {
classExclude 'com\\.yahoo\\.sketches\\.hll\\..*'
// add solrj exclusions
- MissingDeps.addExclusionsFrom(project(':solr:solr-solrj'), project)
+ addExclusionsFrom(project(':solr:solr-solrj'))
}
unusedDeps {
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index 406465b..03283ed 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import org.apache.lucene.gradle.MissingDeps
apply plugin: 'java-library'
apply plugin: 'maven-publish'
@@ -92,7 +90,7 @@ dependencies {
missingDeps {
// add solr-core exclusions
- MissingDeps.addExclusionsFrom(project(':solr:solr-core'), project)
+ addExclusionsFrom(project(':solr:solr-core'))
}
diff --git a/versions.lock b/versions.lock
index a6afa90..e6a6d23 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,5 +1,7 @@
# Run ./gradlew --write-locks to regenerate this file
+asm:asm:3.3.1 (1 constraints: db056f47)
c3p0:c3p0:0.9.1.1 (1 constraints: eb0c6e1a)
+cglib:cglib:2.2.2 (1 constraints: 8d0f6f86)
com.adobe.xmp:xmpcore:5.1.3 (2 constraints: cf13ce64)
com.beust:jcommander:1.35 (1 constraints: f805cf47)
com.carrotsearch:hppc:0.8.1 (2 constraints: af0fd8a6)
@@ -14,6 +16,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.8 (1 constraints:
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.8 (1 constraints: 15051836)
com.fasterxml.woodstox:woodstox-core:5.2.0 (1 constraints: 360a63bc)
com.github.ben-manes.caffeine:caffeine:2.4.0 (1 constraints: 08050136)
+com.github.cliftonlabs:json-simple:3.0.2 (1 constraints: 82145f7d)
com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01)
com.github.junrar:junrar:2.0.0 (1 constraints: 590ce601)
com.github.openjson:openjson:1.0.10 (1 constraints: 890c6b0e)
@@ -40,9 +43,10 @@ com.sun.mail:gimap:1.5.1 (1 constraints: 09050036)
com.sun.mail:javax.mail:1.5.1 (1 constraints: 09050036)
com.sun.xml.fastinfoset:FastInfoset:1.2.13 (1 constraints: ec0d9743)
com.tdunning:t-digest:3.1 (1 constraints: a804212c)
+commons-beanutils:commons-beanutils:1.9.3 (3 constraints: 2a296cb5)
commons-cli:commons-cli:1.2 (2 constraints: 161107d9)
commons-codec:commons-codec:1.11 (4 constraints: 2d29e02a)
-commons-collections:commons-collections:3.2.2 (2 constraints: d911ad14)
+commons-collections:commons-collections:3.2.2 (3 constraints: 9121ccda)
commons-fileupload:commons-fileupload:1.3.3 (1 constraints: 0905fc35)
commons-io:commons-io:2.6 (4 constraints: 2e2d61f3)
commons-lang:commons-lang:2.6 (3 constraints: df29f552)
@@ -92,8 +96,9 @@ org.apache.calcite.avatica:avatica-core:1.13.0 (1 constraints: 3705323b)
org.apache.commons:commons-collections4:4.2 (2 constraints: b90cdc15)
org.apache.commons:commons-compress:1.18 (4 constraints: 2128b5ae)
org.apache.commons:commons-csv:1.5 (1 constraints: ff0b57e9)
+org.apache.commons:commons-digester3:3.2 (2 constraints: 25274d81)
org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
-org.apache.commons:commons-lang3:3.8.1 (3 constraints: bf1cfe0d)
+org.apache.commons:commons-lang3:3.8.1 (6 constraints: e755a5e0)
org.apache.commons:commons-math3:3.6.1 (1 constraints: 0c050d36)
org.apache.commons:commons-text:1.6 (1 constraints: ab04202c)
org.apache.curator:curator-client:2.13.0 (1 constraints: 3805383b)
@@ -150,9 +155,9 @@ org.apache.tika:tika-parsers:1.19.1 (1 constraints: 3e05453b)
org.apache.tika:tika-xmp:1.19.1 (1 constraints: 3e05453b)
org.apache.uima:uimafit-core:2.2.0 (1 constraints: 5b0cec01)
org.apache.uima:uimaj-core:2.9.0 (1 constraints: 620c0102)
-org.apache.velocity:velocity-engine-core:2.1 (1 constraints: a7041e2c)
-org.apache.velocity.tools:velocity-tools-generic:3.0 (1 constraints: a704202c)
-org.apache.velocity.tools:velocity-tools-view:3.0 (1 constraints: a704202c)
+org.apache.velocity:velocity-engine-core:2.1 (4 constraints: 3d40ca9b)
+org.apache.velocity.tools:velocity-tools-generic:3.0 (2 constraints: a6174b33)
+org.apache.velocity.tools:velocity-tools-view:3.0 (2 constraints: 2019919a)
org.apache.velocity.tools:velocity-tools-view-jsp:3.0 (1 constraints: a704202c)
org.apache.ws.xmlschema:xmlschema-core:2.2.3 (1 constraints: 370a5abc)
org.apache.xmlbeans:xmlbeans:3.0.1 (2 constraints: de126c41)
@@ -219,10 +224,10 @@ org.quartz-scheduler:quartz:2.2.0 (1 constraints: 2106eb4d)
org.restlet.jee:org.restlet:2.3.0 (1 constraints: 0705fe35)
org.rrd4j:rrd4j:3.5 (1 constraints: ac04252c)
org.simpleframework:simple-xml:2.7.1 (3 constraints: bd20563c)
-org.slf4j:jcl-over-slf4j:1.7.25 (3 constraints: 0018d6b7)
-org.slf4j:jul-to-slf4j:1.7.25 (2 constraints: d5113e11)
-org.slf4j:log4j-over-slf4j:1.7.25 (1 constraints: 4005473b)
-org.slf4j:slf4j-api:1.7.25 (26 constraints: e3280af0)
+org.slf4j:jcl-over-slf4j:1.7.26 (3 constraints: 0018d6b7)
+org.slf4j:jul-to-slf4j:1.7.26 (2 constraints: d5113e11)
+org.slf4j:log4j-over-slf4j:1.7.26 (1 constraints: 4005473b)
+org.slf4j:slf4j-api:1.7.26 (29 constraints: a8621b92)
org.tallison:jmatio:1.5 (2 constraints: a810a0b8)
org.tukaani:xz:1.8 (2 constraints: ae100fb9)
org.yaml:snakeyaml:1.23 (1 constraints: 6e17f627)