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/12 05:17:58 UTC
[lucene-solr] branch jira/SOLR-13452_gradle_3 updated: SOLR-13452:
Make contrib-dataimporthandler dependency checker compliant.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/SOLR-13452_gradle_3 by this push:
new 055da99 SOLR-13452: Make contrib-dataimporthandler dependency checker compliant.
055da99 is described below
commit 055da99e941b99b62f52a67fe1a222a907c17615
Author: markrmiller <ma...@apache.org>
AuthorDate: Wed Jun 12 00:17:50 2019 -0500
SOLR-13452: Make contrib-dataimporthandler dependency checker compliant.
---
.../groovy/org/apache/lucene/gradle/MissingDeps.groovy | 11 +++++++++++
solr/contrib/clustering/build.gradle | 17 ++++++-----------
solr/contrib/dataimporthandler/build.gradle | 13 ++++++++++++-
3 files changed, 29 insertions(+), 12 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 0928fb9..7796f0f 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/MissingDeps.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/MissingDeps.groovy
@@ -173,6 +173,17 @@ class MissingDeps extends DefaultTask {
}
return topLvlProject
}
+
+ public static void addExclusionsFrom(Project project, MissingDeps to) {
+ Set<String> depExcludes = project.missingDeps.getDepExcludes()
+ for (String exclude : depExcludes) {
+ to.depExclude exclude
+ }
+ Set<String> classExcludes = project.missingDeps.getClassExcludes()
+ for (String exclude : classExcludes) {
+ to.classExclude exclude
+ }
+ }
}
diff --git a/solr/contrib/clustering/build.gradle b/solr/contrib/clustering/build.gradle
index 96ec234..e153486 100644
--- a/solr/contrib/clustering/build.gradle
+++ b/solr/contrib/clustering/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+import org.apache.lucene.gradle.MissingDeps
+
apply plugin: 'java-library'
apply plugin: 'maven-publish'
apply plugin: org.apache.lucene.gradle.PartOfDist
@@ -40,15 +42,8 @@ dependencies {
missingDeps {
- classExclude 'org\\.xmlpull\\.v1\\.XmlPullParser.*' // current not brought in, wanted by simple-xml
+ classExclude 'org\\.xmlpull\\.v1\\.XmlPullParser.*' // currently not brought in, wanted by simple-xml
- // solr-core's excludes
- Set<String> depExcludes = project(':solr:solr-core').missingDeps.getDepExcludes()
- for (String exclude : depExcludes) {
- depExclude exclude
- }
- Set<String> classExcludes = project(':solr:solr-core').missingDeps.getClassExcludes()
- for (String exclude : classExcludes) {
- classExclude exclude
- }
-}
\ No newline at end of file
+ // add solr-core exclusions
+ MissingDeps.addExclusionsFrom(project(':solr:solr-core'), project.missingDeps)
+}
diff --git a/solr/contrib/dataimporthandler/build.gradle b/solr/contrib/dataimporthandler/build.gradle
index 2ad7155..1ff74cd 100644
--- a/solr/contrib/dataimporthandler/build.gradle
+++ b/solr/contrib/dataimporthandler/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+import org.apache.lucene.gradle.MissingDeps
+
apply plugin: 'java-library'
apply plugin: 'maven-publish'
apply plugin: org.apache.lucene.gradle.PartOfDist
@@ -58,4 +60,13 @@ dependencies {
testImplementation ('net.bytebuddy:byte-buddy')
testImplementation ('org.objenesis:objenesis')
-}
\ No newline at end of file
+}
+
+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.missingDeps)
+}
+