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/06 11:16:16 UTC
[lucene-solr] branch gradle-master updated (cd7fd6d -> 8e81037)
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 cd7fd6d Clean up test property passing and move a number of properties and randomizations from common.build (ant counterpart)
add 2387bb9 SOLR-13990: Switch out woodstox-core-asl with aalto-xml and upgrade woodstox stax-2 API (#1050)
add d2b01ef SOLR-13831: Context property _loop_iter_ should be a string in order to support variable expansion.
add 33ca971 SOLR-14020: move hadoop hacks out of lucene TestSecurityManager into a solr one
add 7417fa1 SOLR-13954: Embedded ZooKeeper in Solr now does not try to load JettyAdminServer (#1059)
new f371df3 Merge remote-tracking branch 'origin/master' into gradle-master
new 8e81037 Merging with master, updating deps.
The 2 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 +-
.../apache/lucene/util/TestSecurityManager.java | 87 ----------------------
solr/CHANGES.txt | 4 +
solr/common-build.xml | 5 ++
.../solr/cloud/autoscaling/sim/SimScenario.java | 2 +-
.../solr/handler/tagger/XmlOffsetCorrector.java | 26 ++-----
.../cloud/autoscaling/sim/TestSimScenario.java | 7 +-
solr/licenses/aalto-xml-1.2.2.jar.sha1 | 1 +
...c-LICENSE-ASL.txt => aalto-xml-LICENSE-ASL.txt} | 2 +-
.../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 ++++++++
.../staxmate-NOTICE.txt} | 0
solr/licenses/woodstox-core-asl-4.4.1.jar.sha1 | 1 -
solr/server/solr/zoo.cfg | 3 +
.../solrcloud-autoscaling-policy-preferences.adoc | 2 +-
solr/solrj/build.gradle | 6 +-
solr/solrj/ivy.xml | 4 +-
.../src/test-files/solrj/solr/multicore/zoo.cfg | 2 +
.../org/apache/solr/util/SolrSecurityManager.java | 13 ++--
versions.lock | 5 +-
versions.props | 5 +-
24 files changed, 89 insertions(+), 128 deletions(-)
create mode 100644 solr/licenses/aalto-xml-1.2.2.jar.sha1
copy solr/licenses/{jsonic-LICENSE-ASL.txt => aalto-xml-LICENSE-ASL.txt} (99%)
copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/aalto-xml-NOTICE.txt} (100%)
delete mode 100644 solr/licenses/stax2-api-3.1.4.jar.sha1
create mode 100644 solr/licenses/stax2-api-4.2.jar.sha1
create mode 100644 solr/licenses/staxmate-2.3.1.jar.sha1
create mode 100644 solr/licenses/staxmate-LICENSE-BSD.txt
copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => licenses/staxmate-NOTICE.txt} (100%)
delete mode 100644 solr/licenses/woodstox-core-asl-4.4.1.jar.sha1
copy lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java => solr/test-framework/src/java/org/apache/solr/util/SolrSecurityManager.java (95%)
[lucene-solr] 01/02: 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 f371df327fb746734cbcca0fae1dd36559b2ee86
Merge: cd7fd6d 7417fa1
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 6 11:57:29 2019 +0100
Merge remote-tracking branch 'origin/master' into gradle-master
lucene/ivy-versions.properties | 6 +-
.../apache/lucene/util/TestSecurityManager.java | 87 ---------
solr/CHANGES.txt | 4 +
solr/common-build.xml | 5 +
.../solr/cloud/autoscaling/sim/SimScenario.java | 2 +-
.../solr/handler/tagger/XmlOffsetCorrector.java | 26 +--
.../cloud/autoscaling/sim/TestSimScenario.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/server/solr/zoo.cfg | 3 +
.../solrcloud-autoscaling-policy-preferences.adoc | 2 +-
solr/solrj/ivy.xml | 4 +-
.../src/test-files/solrj/solr/multicore/zoo.cfg | 2 +
.../org/apache/solr/util/SolrSecurityManager.java | 13 +-
21 files changed, 279 insertions(+), 121 deletions(-)
[lucene-solr] 02/02: Merging with master, updating deps.
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 8e81037180b11ea3a666b64d8be059597b587f3c
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 6 12:16:07 2019 +0100
Merging with master, updating deps.
---
solr/solrj/build.gradle | 6 ++++--
versions.lock | 5 +++--
versions.props | 5 +++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index c77d2dc..69ff4e7 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -36,8 +36,10 @@ dependencies {
exclude group: "org.slf4j", module: "slf4j-log4j12"
})
- api('org.codehaus.woodstox:woodstox-core-asl', {
- exclude group: "javax.xml.stream", module: "stax-api"
+ api('com.fasterxml:aalto-xml', {
+ })
+
+ api('com.fasterxml.staxmate:staxmate', {
})
testImplementation project(':solr:test-framework')
diff --git a/versions.lock b/versions.lock
index d02ff02..6b3d074 100644
--- a/versions.lock
+++ b/versions.lock
@@ -7,10 +7,12 @@ 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)
@@ -159,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:3.1.4 (2 constraints: 241635f1)
-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 bbca163..ea3786c 100644
--- a/versions.props
+++ b/versions.props
@@ -87,8 +87,9 @@ 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=3.1.4
-org.codehaus.woodstox:woodstox-core-asl=4.4.1
+org.codehaus.woodstox:stax2-api=4.2
+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