You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2019/12/05 13:08:07 UTC
[lucene-solr] branch master updated: SOLR-13990: Switch out
woodstox-core-asl with aalto-xml and upgrade woodstox stax-2 API (#1050)
This is an automated email from the ASF dual-hosted git repository.
anshum pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 2387bb9 SOLR-13990: Switch out woodstox-core-asl with aalto-xml and upgrade woodstox stax-2 API (#1050)
2387bb9 is described below
commit 2387bb9d60ae44eeeb4fbcb2f2877f46be5303a0
Author: Anshum Gupta <an...@apache.org>
AuthorDate: Thu Dec 5 18:37:53 2019 +0530
SOLR-13990: Switch out woodstox-core-asl with aalto-xml and upgrade woodstox stax-2 API (#1050)
---
lucene/ivy-versions.properties | 6 +-
solr/CHANGES.txt | 2 +
.../solr/handler/tagger/XmlOffsetCorrector.java | 26 +--
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 +-
13 files changed, 253 insertions(+), 24 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index a1f6db3..5f3d787 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -22,6 +22,8 @@ com.fasterxml.jackson.core.version = 2.9.9
/com.fasterxml.jackson.core/jackson-core = ${com.fasterxml.jackson.core.version}
/com.fasterxml.jackson.core/jackson-databind = 2.9.9.3
/com.fasterxml.jackson.dataformat/jackson-dataformat-smile = ${com.fasterxml.jackson.core.version}
+/com.fasterxml.staxmate/staxmate = 2.3.1
+/com.fasterxml/aalto-xml = 1.2.2
/com.github.ben-manes.caffeine/caffeine = 2.8.0
/com.github.virtuald/curvesapi = 1.04
@@ -257,9 +259,7 @@ org.codehaus.janino.version = 3.0.9
/org.codehaus.janino/commons-compiler = ${org.codehaus.janino.version}
/org.codehaus.janino/janino = ${org.codehaus.janino.version}
-/org.codehaus.woodstox/stax2-api = 3.1.4
-/org.codehaus.woodstox/woodstox-core-asl = 4.4.1
-
+/org.codehaus.woodstox/stax2-api = 4.2
org.eclipse.jetty.version = 9.4.19.v20190610
/org.eclipse.jetty.http2/http2-client = ${org.eclipse.jetty.version}
/org.eclipse.jetty.http2/http2-common = ${org.eclipse.jetty.version}
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9f9bc9f..2fa39f6 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -163,6 +163,8 @@ Improvements
* SOLR-11706: Add support for aggregation on multivalued fields in JSON facets. min, max, avg, sum, sumsq, stddev,
variance, percentile aggregations now have support for multivalued fields. (hossman, Munendra S N)
+* SOLR-13990: Switch out woodstox-core-asl with aalto-xml and upgrade woodstox stax-2 API (Anshum Gupta, Mark Miller)
+
Optimizations
---------------------
(No changes)
diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java b/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java
index 576328f..8d0f4b4 100644
--- a/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java
+++ b/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java
@@ -22,18 +22,16 @@
package org.apache.solr.handler.tagger;
-import javax.xml.stream.XMLResolver;
+import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.XMLEvent;
-import java.io.InputStream;
-import java.io.StringReader;
-
-import com.ctc.wstx.stax.WstxInputFactory;
-import org.apache.commons.io.input.ClosedInputStream;
+import org.apache.solr.common.EmptyEntityResolver;
import org.codehaus.stax2.LocationInfo;
import org.codehaus.stax2.XMLInputFactory2;
import org.codehaus.stax2.XMLStreamReader2;
+import java.io.StringReader;
+
/**
* Corrects offsets to adjust for XML formatted data. The goal is such that the caller should be
* able to insert a start XML tag at the start offset and a corresponding end XML tag at the end
@@ -45,21 +43,13 @@ import org.codehaus.stax2.XMLStreamReader2;
*/
public class XmlOffsetCorrector extends OffsetCorrector {
- //TODO use StAX without hard requirement on woodstox. xmlStreamReader.getLocation().getCharacterOffset()
+ //TODO use StAX without hard requirement on woodstox. xmlStreamReader.getLocation().getCharacterOffset()
- private static final XMLInputFactory2 XML_INPUT_FACTORY;
+ private static final XMLInputFactory XML_INPUT_FACTORY;
static {
- // note: similar code in Solr's EmptyEntityResolver
- XML_INPUT_FACTORY = new WstxInputFactory();
- XML_INPUT_FACTORY.setXMLResolver(new XMLResolver() {
- @Override
- public InputStream resolveEntity(String publicId, String systemId, String baseURI, String namespace) {
- return ClosedInputStream.CLOSED_INPUT_STREAM;
- }
- });
// TODO disable DTD?
- // XML_INPUT_FACTORY.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE)
- XML_INPUT_FACTORY.configureForSpeed();
+ XML_INPUT_FACTORY = XMLInputFactory2.newFactory();
+ XML_INPUT_FACTORY.setXMLResolver(EmptyEntityResolver.STAX_INSTANCE);
}
/**
diff --git a/solr/licenses/aalto-xml-1.2.2.jar.sha1 b/solr/licenses/aalto-xml-1.2.2.jar.sha1
new file mode 100644
index 0000000..29d5581
--- /dev/null
+++ b/solr/licenses/aalto-xml-1.2.2.jar.sha1
@@ -0,0 +1 @@
+c99d6ab984ef5c61114733becc06cb584e28a0c7
diff --git a/solr/licenses/aalto-xml-LICENSE-ASL.txt b/solr/licenses/aalto-xml-LICENSE-ASL.txt
new file mode 100644
index 0000000..e6e77b0
--- /dev/null
+++ b/solr/licenses/aalto-xml-LICENSE-ASL.txt
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/solr/licenses/aalto-xml-NOTICE.txt b/solr/licenses/aalto-xml-NOTICE.txt
new file mode 100644
index 0000000..e69de29
diff --git a/solr/licenses/stax2-api-3.1.4.jar.sha1 b/solr/licenses/stax2-api-3.1.4.jar.sha1
deleted file mode 100644
index d5f4020..0000000
--- a/solr/licenses/stax2-api-3.1.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ac19014b1e6a7c08aad07fe114af792676b685b7
diff --git a/solr/licenses/stax2-api-4.2.jar.sha1 b/solr/licenses/stax2-api-4.2.jar.sha1
new file mode 100644
index 0000000..6f46d70
--- /dev/null
+++ b/solr/licenses/stax2-api-4.2.jar.sha1
@@ -0,0 +1 @@
+13c2b30926bca0429c704c4b4ca0b5d0432b69cd
diff --git a/solr/licenses/staxmate-2.3.1.jar.sha1 b/solr/licenses/staxmate-2.3.1.jar.sha1
new file mode 100644
index 0000000..5f291b5
--- /dev/null
+++ b/solr/licenses/staxmate-2.3.1.jar.sha1
@@ -0,0 +1 @@
+d0aabe584bed77aff0fc9bb8846808e7b31a5352
diff --git a/solr/licenses/staxmate-LICENSE-BSD.txt b/solr/licenses/staxmate-LICENSE-BSD.txt
new file mode 100644
index 0000000..f0d1390
--- /dev/null
+++ b/solr/licenses/staxmate-LICENSE-BSD.txt
@@ -0,0 +1,33 @@
+This copy of StaxMate processing library is licensed under
+BSD License ("new BSD").
+See http://www.opensource.org/licenses/bsd-license.php
+for details.
+
+Full license text is as follows:
+
+--------------------------------------------------------------------------
+* Copyright (c) 2007, Tatu Saloranta
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the <organization> nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------
diff --git a/solr/licenses/staxmate-NOTICE.txt b/solr/licenses/staxmate-NOTICE.txt
new file mode 100644
index 0000000..e69de29
diff --git a/solr/licenses/woodstox-core-asl-4.4.1.jar.sha1 b/solr/licenses/woodstox-core-asl-4.4.1.jar.sha1
deleted file mode 100644
index 4432f29..0000000
--- a/solr/licenses/woodstox-core-asl-4.4.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-84fee5eb1a4a1cefe65b6883c73b3fa83be3c1a1
diff --git a/solr/solrj/ivy.xml b/solr/solrj/ivy.xml
index 5312c42..5e04f71 100644
--- a/solr/solrj/ivy.xml
+++ b/solr/solrj/ivy.xml
@@ -35,7 +35,9 @@
<dependency org="org.apache.httpcomponents" name="httpcore" rev="${/org.apache.httpcomponents/httpcore}" conf="compile"/>
<dependency org="commons-io" name="commons-io" rev="${/commons-io/commons-io}" conf="compile"/>
<dependency org="org.apache.commons" name="commons-math3" rev="${/org.apache.commons/commons-math3}" conf="compile"/>
- <dependency org="org.codehaus.woodstox" name="woodstox-core-asl" rev="${/org.codehaus.woodstox/woodstox-core-asl}" conf="compile"/>
+
+ <dependency org="com.fasterxml" name="aalto-xml" rev="${/com.fasterxml/aalto-xml}" conf="compile"/>
+ <dependency org="com.fasterxml.staxmate" name="staxmate" rev="${/com.fasterxml.staxmate/staxmate}" conf="compile"/>
<dependency org="org.codehaus.woodstox" name="stax2-api" rev="${/org.codehaus.woodstox/stax2-api}" conf="compile"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" conf="compile"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="compile"/>