[lucene-solr] 02/02: SOLR-13452: Fix the fix for the strange 'xml-apis:xmlapis comes in on osx and not linux' issue. Also, update the consistent-versions plugin to 1.12.4.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch jira/SOLR-13452_gradle_6
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit b2d0272cab8a6dd35f07bcd26a0cfccac53746d2
Author: markrmiller <ma...@apache.org>
AuthorDate: Sat Sep 14 17:02:14 2019 -0500

    SOLR-13452: Fix the fix for the strange 'xml-apis:xmlapis comes in on osx and not linux' issue. Also, update the consistent-versions plugin to 1.12.4.
---
 build.gradle   | 4 ++--
 versions.lock  | 4 ++--
 versions.props | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0249a56..acb16f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ import org.gradle.api.Project
 import org.apache.commons.io.FilenameUtils
 
 plugins {
-  id "com.palantir.consistent-versions" version "1.11.0"
+  id "com.palantir.consistent-versions" version "1.12.4"
 }
 
 // TOC
@@ -250,7 +250,7 @@ configure(allprojects) {
       exclude group: 'org.apache.yetus', module: 'audience-annotations' // annotations jar brought in by zk
       exclude group: 'org.slf4j', module: 'slf4j-log4j12' // zk and perhaps others can bring in log4j12 binding
       
-      exclude group: 'xml-apis', module: 'xml-apis:xml-apis' // this is brought in depending on env - ensure it's not
+      exclude group: 'xml-apis', module: 'xml-apis' // somehow can be inconsistenly brought in by xerces:xercesImpl - exlude it
     }
     
     modules {
diff --git a/versions.lock b/versions.lock
index 91d8a95..211b6bc 100644
--- a/versions.lock
+++ b/versions.lock
@@ -81,7 +81,7 @@ net.arnx:jsonic:1.2.7 (2 constraints: db10d4d1)
 net.minidev:accessors-smart:1.2 (1 constraints: e60926a4)
 net.minidev:json-smart:2.3 (3 constraints: 04272e32)
 net.sourceforge.argparse4j:argparse4j:0.8.1 (1 constraints: 0b050436)
-net.sourceforge.nekohtml:nekohtml:1.9.17 (1 constraints: 4405503b)
+net.sourceforge.nekohtml:nekohtml:1.9.22 (1 constraints: 40054d3b)
 net.thisptr:jackson-jq:0.0.8 (1 constraints: 0a05f335)
 org.antlr:antlr4-runtime:4.5.1-1 (1 constraints: 6a05b240)
 org.apache.avro:avro:1.7.7 (7 constraints: 1884170b)
@@ -218,7 +218,7 @@ org.tukaani:xz:1.8 (1 constraints: ad04222c)
 org.xerial.snappy:snappy-java:1.0.5 (1 constraints: 4e09a79c)
 org.yaml:snakeyaml:1.23 (1 constraints: 6e17f627)
 ua.net.nlp:morfologik-ukrainian-search:3.9.0 (1 constraints: 0e051536)
-xerces:xercesImpl:2.9.1 (2 constraints: f613d869)
+xerces:xercesImpl:2.12.0 (2 constraints: 4714e889)
 
 [Test dependencies]
 aopalliance:aopalliance:1.0 (1 constraints: 170a83ac)
diff --git a/versions.props b/versions.props
index fdd4c81..1bea861 100644
--- a/versions.props
+++ b/versions.props
@@ -47,7 +47,7 @@ net.arnx:jsonic=1.2.7
 net.bytebuddy:byte-buddy=1.9.3
 net.hydromatic:eigenbase-properties=1.1.5
 net.sourceforge.argparse4j:argparse4j=0.8.1
-net.sourceforge.nekohtml:nekohtml=1.9.17
+net.sourceforge.nekohtml:nekohtml=1.9.22
 net.thisptr:jackson-jq=0.0.8
 org.antlr:antlr4-runtime=4.5.1-1
 org.apache.calcite.avatica:avatica-core=1.13.0
@@ -111,4 +111,4 @@ org.slf4j:*=1.7.24
 org.tallison:jmatio=1.5
 org.tukaani:xz=1.8
 ua.net.nlp:morfologik-ukrainian-search=3.9.0
-xerces:xercesImpl=2.9.1
+xerces:xercesImpl=2.12.0