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/07 09:57:24 UTC
[lucene-solr] branch gradle-master updated (519ed99 -> c3bb81f)
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 519ed99 Enable solr testing with solr security manager.
new 78575f0 Revert "Adding woodstox temporarily so that tests pass."
new 2a6ffd2 Reverting aalto change.
add 62e0222 SOLR-13087: Remove 'whoami' usage in bin/solr
add 155ab11 Revert "SOLR-13990: Switch out woodstox-core-asl with aalto-xml and upgrade woodstox stax-2 API (#1050)" (#1063)
add 7d5d44a SOLR-13988: Harden CreateCollectionCleanupTest. Incorporate Dawid Weiss' suggestion for windows
add a1e51cd SOLR-11706: minor refactors
new c3bb81f Merge remote-tracking branch 'origin/master' into gradle-master
The 3 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:
lucene/ivy-versions.properties | 6 +-
solr/CHANGES.txt | 5 +-
solr/bin/solr | 4 +-
solr/core/build.gradle | 6 -
.../solr/handler/tagger/XmlOffsetCorrector.java | 26 ++-
.../java/org/apache/solr/search/facet/AggUtil.java | 24 ++-
.../org/apache/solr/search/facet/DocValuesAcc.java | 34 ++--
.../java/org/apache/solr/search/facet/HLLAgg.java | 12 +-
.../org/apache/solr/search/facet/MinMaxAgg.java | 5 +-
.../apache/solr/search/facet/PercentileAgg.java | 9 +-
.../java/org/apache/solr/search/facet/SlotAcc.java | 4 +-
.../org/apache/solr/search/facet/StddevAgg.java | 8 +-
.../org/apache/solr/search/facet/UniqueAgg.java | 12 +-
.../org/apache/solr/search/facet/VarianceAgg.java | 8 +-
.../solr/cloud/CreateCollectionCleanupTest.java | 7 +-
solr/licenses/aalto-xml-1.2.2.jar.sha1 | 1 -
solr/licenses/aalto-xml-LICENSE-ASL.txt | 201 ---------------------
solr/licenses/aalto-xml-NOTICE.txt | 0
solr/licenses/stax2-api-3.1.4.jar.sha1 | 1 +
solr/licenses/stax2-api-4.2.jar.sha1 | 1 -
solr/licenses/staxmate-2.3.1.jar.sha1 | 1 -
solr/licenses/staxmate-LICENSE-BSD.txt | 33 ----
solr/licenses/staxmate-NOTICE.txt | 0
solr/licenses/woodstox-core-asl-4.4.1.jar.sha1 | 1 +
solr/solrj/build.gradle | 5 +-
solr/solrj/ivy.xml | 4 +-
versions.lock | 4 +-
versions.props | 6 +-
28 files changed, 109 insertions(+), 319 deletions(-)
delete mode 100644 solr/licenses/aalto-xml-1.2.2.jar.sha1
delete mode 100644 solr/licenses/aalto-xml-LICENSE-ASL.txt
delete mode 100644 solr/licenses/aalto-xml-NOTICE.txt
create mode 100644 solr/licenses/stax2-api-3.1.4.jar.sha1
delete mode 100644 solr/licenses/stax2-api-4.2.jar.sha1
delete mode 100644 solr/licenses/staxmate-2.3.1.jar.sha1
delete mode 100644 solr/licenses/staxmate-LICENSE-BSD.txt
delete mode 100644 solr/licenses/staxmate-NOTICE.txt
create mode 100644 solr/licenses/woodstox-core-asl-4.4.1.jar.sha1
[lucene-solr] 03/03: 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 c3bb81f032a0628d83a63c45d592ed3380ad1cc1
Merge: 2a6ffd2 a1e51cd
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Sat Dec 7 10:53:34 2019 +0100
Merge remote-tracking branch 'origin/master' into gradle-master
lucene/ivy-versions.properties | 6 +-
solr/CHANGES.txt | 5 +-
solr/bin/solr | 4 +-
.../solr/handler/tagger/XmlOffsetCorrector.java | 26 ++-
.../java/org/apache/solr/search/facet/AggUtil.java | 24 ++-
.../org/apache/solr/search/facet/DocValuesAcc.java | 34 ++--
.../java/org/apache/solr/search/facet/HLLAgg.java | 12 +-
.../org/apache/solr/search/facet/MinMaxAgg.java | 5 +-
.../apache/solr/search/facet/PercentileAgg.java | 9 +-
.../java/org/apache/solr/search/facet/SlotAcc.java | 4 +-
.../org/apache/solr/search/facet/StddevAgg.java | 8 +-
.../org/apache/solr/search/facet/UniqueAgg.java | 12 +-
.../org/apache/solr/search/facet/VarianceAgg.java | 8 +-
.../solr/cloud/CreateCollectionCleanupTest.java | 7 +-
solr/licenses/aalto-xml-1.2.2.jar.sha1 | 1 -
solr/licenses/aalto-xml-LICENSE-ASL.txt | 201 ---------------------
solr/licenses/aalto-xml-NOTICE.txt | 0
solr/licenses/stax2-api-3.1.4.jar.sha1 | 1 +
solr/licenses/stax2-api-4.2.jar.sha1 | 1 -
solr/licenses/staxmate-2.3.1.jar.sha1 | 1 -
solr/licenses/staxmate-LICENSE-BSD.txt | 33 ----
solr/licenses/staxmate-NOTICE.txt | 0
solr/licenses/woodstox-core-asl-4.4.1.jar.sha1 | 1 +
solr/solrj/ivy.xml | 4 +-
24 files changed, 103 insertions(+), 304 deletions(-)
[lucene-solr] 02/03: Reverting aalto change.
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 2a6ffd23fa2635f379425fc03a1f9e4cc5fec571
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Sat Dec 7 10:53:30 2019 +0100
Reverting aalto change.
---
solr/solrj/build.gradle | 5 +++--
versions.lock | 5 ++---
versions.props | 5 ++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index e9025a5..c77d2dc 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -36,8 +36,9 @@ dependencies {
exclude group: "org.slf4j", module: "slf4j-log4j12"
})
- api('com.fasterxml:aalto-xml')
- api('com.fasterxml.staxmate:staxmate')
+ api('org.codehaus.woodstox:woodstox-core-asl', {
+ exclude group: "javax.xml.stream", module: "stax-api"
+ })
testImplementation project(':solr:test-framework')
testImplementation 'org.eclipse.jetty:jetty-webapp'
diff --git a/versions.lock b/versions.lock
index 6b3d074..d02ff02 100644
--- a/versions.lock
+++ b/versions.lock
@@ -7,12 +7,10 @@ com.carrotsearch.thirdparty:simple-xml-safe:2.7.1 (1 constraints: a60a82ca)
com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
com.drewnoakes:metadata-extractor:2.11.0 (1 constraints: 3605323b)
com.epam:parso:2.0.9 (1 constraints: 0d05fe35)
-com.fasterxml:aalto-xml:1.2.2 (1 constraints: 0705f835)
com.fasterxml.jackson.core:jackson-annotations:2.9.9 (2 constraints: 0a1d1637)
com.fasterxml.jackson.core:jackson-core:2.9.9 (3 constraints: 23350c6a)
com.fasterxml.jackson.core:jackson-databind:2.9.9.3 (3 constraints: 741a6389)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.9 (1 constraints: 16051936)
-com.fasterxml.staxmate:staxmate:2.3.1 (1 constraints: 0805ff35)
com.github.ben-manes.caffeine:caffeine:2.8.0 (1 constraints: 0c050d36)
com.github.jnr:jffi:1.2.18 (1 constraints: b20902ab)
com.github.jnr:jnr-constants:0.9.12 (4 constraints: ed2c9d5d)
@@ -161,7 +159,8 @@ org.checkerframework:checker-qual:2.0.0 (1 constraints: 140ae5b4)
org.codehaus.janino:commons-compiler:3.0.9 (2 constraints: d910f7d1)
org.codehaus.janino:janino:3.0.9 (1 constraints: 0e050336)
org.codehaus.mojo:animal-sniffer-annotations:1.14 (1 constraints: ea09d5aa)
-org.codehaus.woodstox:stax2-api:4.2 (3 constraints: 0d1d3ffc)
+org.codehaus.woodstox:stax2-api:3.1.4 (2 constraints: 241635f1)
+org.codehaus.woodstox:woodstox-core-asl:4.4.1 (1 constraints: 0b050c36)
org.eclipse.jetty:jetty-alpn-client:9.4.19.v20190610 (3 constraints: d12c8400)
org.eclipse.jetty:jetty-alpn-java-client:9.4.19.v20190610 (1 constraints: 8007517d)
org.eclipse.jetty:jetty-alpn-java-server:9.4.19.v20190610 (1 constraints: 8007517d)
diff --git a/versions.props b/versions.props
index ea3786c..bbca163 100644
--- a/versions.props
+++ b/versions.props
@@ -87,9 +87,8 @@ org.carrot2:carrot2-mini=3.16.2
org.carrot2:morfologik-*=2.1.5
org.ccil.cowan.tagsoup:tagsoup=1.2.1
org.codehaus.janino:*=3.0.9
-org.codehaus.woodstox:stax2-api=4.2
-com.fasterxml:aalto-xml=1.2.2
-com.fasterxml.staxmate:staxmate=2.3.1
+org.codehaus.woodstox:stax2-api=3.1.4
+org.codehaus.woodstox:woodstox-core-asl=4.4.1
org.eclipse.jetty.http2:*=9.4.19.v20190610
org.eclipse.jetty:*=9.4.19.v20190610
org.gagravarr:*=0.8
[lucene-solr] 01/03: Revert "Adding woodstox temporarily so that
tests pass."
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 78575f0a2c138e4a58cc2fa4022dc5c04c2e84f1
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Sat Dec 7 10:51:00 2019 +0100
Revert "Adding woodstox temporarily so that tests pass."
This reverts commit de8a37ee72c83ae35db195238dcd64af0d2df32b.
---
solr/core/build.gradle | 6 ------
versions.lock | 3 +--
versions.props | 7 +++----
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 15369e9..0f0a4d0 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -90,12 +90,6 @@ dependencies {
implementation ('org.apache.hadoop:hadoop-common') { transitive = false }
implementation ('org.apache.hadoop:hadoop-hdfs-client') { transitive = false }
- // Adding this temporarily until it's fixed on master.
- api('org.codehaus.woodstox:woodstox-core-asl', {
- exclude group: "javax.xml.stream", module: "stax-api"
- })
-
-
implementation ('net.hydromatic:eigenbase-properties') { transitive = false }
runtimeOnly ('org.apache.curator:curator-recipes') { transitive = false }
diff --git a/versions.lock b/versions.lock
index 056dc41..6b3d074 100644
--- a/versions.lock
+++ b/versions.lock
@@ -161,8 +161,7 @@ org.checkerframework:checker-qual:2.0.0 (1 constraints: 140ae5b4)
org.codehaus.janino:commons-compiler:3.0.9 (2 constraints: d910f7d1)
org.codehaus.janino:janino:3.0.9 (1 constraints: 0e050336)
org.codehaus.mojo:animal-sniffer-annotations:1.14 (1 constraints: ea09d5aa)
-org.codehaus.woodstox:stax2-api:4.2 (4 constraints: 272e5d38)
-org.codehaus.woodstox:woodstox-core-asl:4.4.1 (1 constraints: 0b050c36)
+org.codehaus.woodstox:stax2-api:4.2 (3 constraints: 0d1d3ffc)
org.eclipse.jetty:jetty-alpn-client:9.4.19.v20190610 (3 constraints: d12c8400)
org.eclipse.jetty:jetty-alpn-java-client:9.4.19.v20190610 (1 constraints: 8007517d)
org.eclipse.jetty:jetty-alpn-java-server:9.4.19.v20190610 (1 constraints: 8007517d)
diff --git a/versions.props b/versions.props
index 22b685f..ea3786c 100644
--- a/versions.props
+++ b/versions.props
@@ -5,9 +5,7 @@ com.cybozu.labs:langdetect=1.1-20120112
com.drewnoakes:metadata-extractor=2.11.0
com.epam:parso=2.0.9
com.fasterxml.jackson*:*=2.9.9
-com.fasterxml.staxmate:staxmate=2.3.1
com.fasterxml.woodstox:*=4.4.1
-com.fasterxml:aalto-xml=1.2.2
com.github.ben-manes.caffeine:caffeine=2.8.0
com.github.virtuald:curvesapi=1.04
com.github.zafarkhaja:java-semver=0.9.0
@@ -38,7 +36,6 @@ commons-logging:commons-logging=1.1.3
de.l3s.boilerpipe:boilerpipe=1.1.0
info.ganglia.gmetric4j:gmetric4j=1.0.7
io.dropwizard.metrics:*=4.0.5
-io.jaegertracing:*=0.35.5
io.netty:*=4.1.29.Final
io.opentracing:*=0.33.0
io.prometheus:*=0.2.0
@@ -91,7 +88,8 @@ org.carrot2:morfologik-*=2.1.5
org.ccil.cowan.tagsoup:tagsoup=1.2.1
org.codehaus.janino:*=3.0.9
org.codehaus.woodstox:stax2-api=4.2
-org.codehaus.woodstox:woodstox-core-asl=4.4.1
+com.fasterxml:aalto-xml=1.2.2
+com.fasterxml.staxmate:staxmate=2.3.1
org.eclipse.jetty.http2:*=9.4.19.v20190610
org.eclipse.jetty:*=9.4.19.v20190610
org.gagravarr:*=0.8
@@ -111,3 +109,4 @@ org.tallison:jmatio=1.5
org.tukaani:xz=1.8
ua.net.nlp:morfologik-ukrainian-search=3.9.0
xerces:xercesImpl=2.9.1
+io.jaegertracing:*=0.35.5
\ No newline at end of file