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/06 05:44:27 UTC
[lucene-solr] 01/04: SOLR-13452: Fix solrj to solr-solrj.
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
commit 8dd00af9f8554ffddd78a6f825ca9de4875b5e7c
Author: markrmiller <ma...@apache.org>
AuthorDate: Wed Jun 5 11:26:25 2019 -0500
SOLR-13452: Fix solrj to solr-solrj.
---
.../org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy | 3 +--
solr/core/build.gradle | 8 ++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy
index 9e1c7fc..1a9bab3 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy
@@ -44,9 +44,8 @@ class LuceneSolrForbiddenApisPlugin implements Plugin<Project> {
if (project.group ==~ /.*?\.lucene(?:\.\w+)?/) {
task.signaturesURLs += getClass().getResource('/forbidden/lucene.txt')
} else if (project.group ==~ /.*?\.solr(?:\.\w+)?/) {
- task.signaturesURLs += getClass().getResource((project.name == 'solrj') ? '/forbidden/solrj.txt' : '/forbidden/solr.txt')
+ task.signaturesURLs += getClass().getResource((project.name == 'solr-solrj') ? '/forbidden/solrj.txt' : '/forbidden/solr.txt')
-
task.doFirst{
task.bundledSignatures += [ 'commons-io-unsafe-' + project.getVersion("commons-io:commons-io") ]
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index e8153c6..7a1760a 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -120,10 +120,10 @@ dependencies {
implementation ('org.apache.curator:curator-recipes') {
exclude group: '*', module: '*' // brings in a lot we don't use
}
- implementation ('org.apache.kerby:kerb-core')
- implementation ('org.apache.kerby:kerb-util')
- implementation ('org.apache.kerby:kerby-asn1')
- implementation ('org.apache.kerby:kerby-pkix')
+ implementation ('org.apache.kerby:kerb-core')
+ implementation ('org.apache.kerby:kerb-util')
+ implementation ('org.apache.kerby:kerby-asn1')
+ implementation ('org.apache.kerby:kerby-pkix')
implementation ('com.tdunning:t-digest')
implementation ('org.apache.calcite:calcite-core') {