Skip to content

Commit

Permalink
SOLR-6830 Upgrade Woodstox and StAX.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1649857 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
sigram committed Jan 6, 2015
1 parent 82b4fed commit 037b72a
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 11 deletions.
3 changes: 2 additions & 1 deletion lucene/ivy-versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ org.codehaus.jackson.version = 1.9.13
/org.codehaus.jackson/jackson-jaxrs = ${org.codehaus.jackson.version}
/org.codehaus.jackson/jackson-mapper-asl = ${org.codehaus.jackson.version}

/org.codehaus.woodstox/wstx-asl = 3.2.7
/org.codehaus.woodstox/stax2-api = 3.1.4
/org.codehaus.woodstox/woodstox-core-asl = 4.4.1
/org.easymock/easymock = 3.0
/org.eclipse.jetty.orbit/javax.servlet = 3.0.0.v201112011016

Expand Down
1 change: 1 addition & 0 deletions solr/licenses/stax2-api-3.1.4.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ac19014b1e6a7c08aad07fe114af792676b685b7
10 changes: 10 additions & 0 deletions solr/licenses/stax2-api-LICENSE-BSD.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Copyright (c) <YEAR>, <OWNER>
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. 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.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
8 changes: 8 additions & 0 deletions solr/licenses/stax2-api-NOTICE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Stax2 API is an extension to basic Stax 1.0 API that adds significant
new functionality, such as full-featured bi-direction validation
interface and high-performance Typed Access API.

(From http://repo1.maven.org/maven2/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4.pom)
Developer: Tatu Saloranta <tatu@fasterxml.com>
License: The BSD License (http://www.opensource.org/licenses/bsd-license.php)
Organization: fasterxml.com (http://fasterxml.com)
1 change: 1 addition & 0 deletions solr/licenses/woodstox-core-asl-4.4.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
84fee5eb1a4a1cefe65b6883c73b3fa83be3c1a1
File renamed without changes.
37 changes: 37 additions & 0 deletions solr/licenses/woodstox-core-asl-NOTICE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
(From http://woodstox.codehaus.org/4.2.0/release-notes/README)
--------------

Woodstox is an XML-parser that allows parsing of XML documents in so-called
pull mode (aka "pull parsing").
It specifically implements StAX 1.0 API:

http://www.jcp.org/en/jsr/detail?id=173

which defines what is closest to being the J2xE standard for XML pull parsers.

Woodstox was originally written by Tatu Saloranta (<tatu.saloranta@iki.fi>.

Woodstox licensing is explained in file LICENSE; be sure to read it
to understand licensing.

Contributions to the source code need to be made as specified by
the License; so that they can be distributed according to the
License terms.
--------------

(From http://svn.codehaus.org/woodstox/wstx/trunk/release-notes/asl/LICENSE)
--------------
This copy of Woodstox XML processor is licensed under the
Apache (Software) License, version 2.0 ("the License").
See the License for details about distribution rights, and the
specific rights regarding derivate works.

You may obtain a copy of the License at:

http://www.apache.org/licenses/

A copy is also included with both the the downloadable source code package
and jar that contains class bytecodes, as file "ASL 2.0". In both cases,
that file should be located next to this file: in source distribution
the location should be "release-notes/asl"; and in jar "META-INF/"
--------------
1 change: 0 additions & 1 deletion solr/licenses/wstx-asl-3.2.7.jar.sha1

This file was deleted.

8 changes: 0 additions & 8 deletions solr/licenses/wstx-asl-NOTICE.txt

This file was deleted.

3 changes: 2 additions & 1 deletion solr/solrj/ivy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
<dependency org="org.apache.httpcomponents" name="httpmime" rev="${/org.apache.httpcomponents/httpmime}" conf="compile"/>
<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.codehaus.woodstox" name="wstx-asl" rev="${/org.codehaus.woodstox/wstx-asl}" conf="compile"/>
<dependency org="org.codehaus.woodstox" name="woodstox-core-asl" rev="${/org.codehaus.woodstox/woodstox-core-asl}" conf="compile"/>
<dependency org="org.codehaus.woodstox" name="stax2-api" rev="${/org.codehaus.woodstox/stax2-api}" conf="compile"/>
<dependency org="org.noggit" name="noggit" rev="${/org.noggit/noggit}" conf="compile"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" conf="compile"/>

Expand Down

0 comments on commit 037b72a

Please sign in to comment.