mirror of https://github.com/apache/lucene.git
LUCENE-8161: Update Spatial4j to 0.7. Add JTS as a test dependency.
This commit is contained in:
David Smiley
parent
d2e8e10233
commit
4700b1d304
|
|
@ -178,6 +178,11 @@ Other
|
|||
* LUCENE-8156: Require users to not have ASM on the Ant classpath during build.
|
||||
This is required by LUCENE-7966. (Adrien Grand, Uwe Schindler)
|
||||
|
||||
* LUCENE-8161: spatial-extras: the Spatial4j dependency has been updated from 0.6 to 0.7,
|
||||
which is drop-in compatible (Lucene doesn't expressly use any of the few API differences).
|
||||
Spatial4j 0.7 is compatible with JTS 1.15.0 and not any prior version. JTS 1.15.0 is
|
||||
dual-licensed to include BSD; prior versions were LGPL. (David Smiley)
|
||||
|
||||
======================= Lucene 7.2.1 =======================
|
||||
|
||||
Bug Fixes
|
||||
|
|
|
|||
|
|
@ -255,7 +255,8 @@ org.gagravarr.vorbis.java.version = 0.8
|
|||
|
||||
/org.jsoup/jsoup = 1.8.2
|
||||
|
||||
/org.locationtech.spatial4j/spatial4j = 0.6
|
||||
/org.locationtech.jts/jts-core = 1.15.0
|
||||
/org.locationtech.spatial4j/spatial4j = 0.7
|
||||
|
||||
/org.mockito/mockito-core = 2.6.2
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
705981b7e25d05a76a3654e597dab6ba423eb79e
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
Eclipse Distribution License - v 1.0
|
||||
|
||||
Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
|
||||
|
||||
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 Eclipse Foundation, Inc. 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 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 OWNER 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.
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
# JTS Topology Suite Licensing
|
||||
|
||||
May 30th, 2017
|
||||
|
||||
## Project Licenses
|
||||
|
||||
The Eclipse Foundation makes available all content in this project ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of either the [Eclipse Public License 1.0](https://www.eclipse.org/legal/epl-v10.html) ("EPL") or the [Eclipse Distribution License 1.0](http://www.eclipse.org/org/documents/edl-v10.php) (a BSD Style License). For purposes of the EPL, "Program" will mean the Content.
|
||||
|
||||
If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at http://www.eclipse.org.
|
||||
|
||||
## Third Party Content
|
||||
|
||||
The Content includes items that have been sourced from third parties as set out below. If you did not receive this Content directly from the Eclipse Foundation, the following is provided for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use.
|
||||
|
||||
### Jdom-contrib version 1.1.3
|
||||
|
||||
The JTS tests module contains source from JDOM Contrib 1.1.3 which is available under the Jdom License [1]. The two files are LineNumberElement.java and LineNumberSAXHandler.java.
|
||||
|
||||
Typical users of this library will not need to depend on this module.
|
||||
|
||||
[1] https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt
|
||||
|
||||
### GeoTools
|
||||
|
||||
JTS includes some code from the GeoTools project. This code has been licensed to the JTS project under the OSGeo BSD License [2] by the GeoTools PSC [3,4].
|
||||
|
||||
[2] https://www.osgeo.org/sites/osgeo.org/files/Page/osgeo-bsd-license.txt
|
||||
[3] https://github.com/geotools/geotools/wiki/JTS-ORA-Contribution
|
||||
[4] https://github.com/geotools/geotools/wiki/JTS-Shapefile-Contribution
|
||||
|
|
@ -1 +0,0 @@
|
|||
0624ae8b9e43265822e0d79b481e34917fec1eba
|
||||
|
|
@ -1 +0,0 @@
|
|||
21b15310bddcfd8c72611c180f20cf23279809a3
|
||||
|
|
@ -0,0 +1 @@
|
|||
1cf04898a92917fd038ac5a92490a8c415f671b9
|
||||
|
|
@ -0,0 +1 @@
|
|||
faa8ba85d503da4ab872d17ba8c00da0098ab2f2
|
||||
|
|
@ -29,6 +29,8 @@
|
|||
<artifact name="spatial4j" type="test" ext="jar" maven:classifier="tests" />
|
||||
</dependency>
|
||||
|
||||
<dependency org="org.locationtech.jts" name="jts-core" rev="${/org.locationtech.jts/jts-core}" conf="test" />
|
||||
|
||||
<dependency org="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" conf="test"/>
|
||||
|
||||
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
|
||||
|
|
|
|||
|
|
@ -75,6 +75,9 @@ Upgrade Notes
|
|||
Solr will support rolling upgrades from old 7.x versions of Solr to the new one until
|
||||
the last release of the 7.x major version.
|
||||
|
||||
* LUCENE-8161: If you are using the spatial JTS library with Solr, you must upgrade to 1.15.0. This new version
|
||||
of JTS is now dual-licensed to include a BSD style license.
|
||||
|
||||
New Features
|
||||
----------------------
|
||||
* SOLR-11285: Simulation framework for autoscaling. (ab)
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
21b15310bddcfd8c72611c180f20cf23279809a3
|
||||
|
|
@ -0,0 +1 @@
|
|||
faa8ba85d503da4ab872d17ba8c00da0098ab2f2
|
||||
Loading…
Reference in New Issue