You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2018/02/08 20:59:58 UTC
lucene-solr:master: LUCENE-8161: Update Spatial4j to 0.7. Add JTS as
a test dependency.
Repository: lucene-solr
Updated Branches:
refs/heads/master d2e8e1023 -> 4700b1d30
LUCENE-8161: Update Spatial4j to 0.7. Add JTS as a test dependency.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4700b1d3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4700b1d3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4700b1d3
Branch: refs/heads/master
Commit: 4700b1d304cf32bcfcdbb89d20dff07a2307e6e2
Parents: d2e8e10
Author: David Smiley <ds...@apache.org>
Authored: Thu Feb 8 15:59:52 2018 -0500
Committer: David Smiley <ds...@apache.org>
Committed: Thu Feb 8 15:59:52 2018 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 5 ++++
lucene/ivy-versions.properties | 3 ++-
lucene/licenses/jts-core-1.15.0.jar.sha1 | 1 +
lucene/licenses/jts-core-LICENSE-BSD_LIKE.txt | 30 ++++++++++++++++++++++
lucene/licenses/jts-core-NOTICE.txt | 29 +++++++++++++++++++++
lucene/licenses/spatial4j-0.6-tests.jar.sha1 | 1 -
lucene/licenses/spatial4j-0.6.jar.sha1 | 1 -
lucene/licenses/spatial4j-0.7-tests.jar.sha1 | 1 +
lucene/licenses/spatial4j-0.7.jar.sha1 | 1 +
lucene/spatial-extras/ivy.xml | 2 ++
solr/CHANGES.txt | 3 +++
solr/licenses/spatial4j-0.6.jar.sha1 | 1 -
solr/licenses/spatial4j-0.7.jar.sha1 | 1 +
13 files changed, 75 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 8ab18a9..7f50f23 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 6270c22..a37e306 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/lucene/licenses/jts-core-1.15.0.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/jts-core-1.15.0.jar.sha1 b/lucene/licenses/jts-core-1.15.0.jar.sha1
new file mode 100644
index 0000000..086ea96
--- /dev/null
+++ b/lucene/licenses/jts-core-1.15.0.jar.sha1
@@ -0,0 +1 @@
+705981b7e25d05a76a3654e597dab6ba423eb79e
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/lucene/licenses/jts-core-LICENSE-BSD_LIKE.txt
----------------------------------------------------------------------
diff --git a/lucene/licenses/jts-core-LICENSE-BSD_LIKE.txt b/lucene/licenses/jts-core-LICENSE-BSD_LIKE.txt
new file mode 100644
index 0000000..1071fed
--- /dev/null
+++ b/lucene/licenses/jts-core-LICENSE-BSD_LIKE.txt
@@ -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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/lucene/licenses/jts-core-NOTICE.txt
----------------------------------------------------------------------
diff --git a/lucene/licenses/jts-core-NOTICE.txt b/lucene/licenses/jts-core-NOTICE.txt
new file mode 100644
index 0000000..f3b3db7
--- /dev/null
+++ b/lucene/licenses/jts-core-NOTICE.txt
@@ -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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/lucene/licenses/spatial4j-0.6-tests.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/spatial4j-0.6-tests.jar.sha1 b/lucene/licenses/spatial4j-0.6-tests.jar.sha1
deleted file mode 100644
index 0fd8404..0000000
--- a/lucene/licenses/spatial4j-0.6-tests.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0624ae8b9e43265822e0d79b481e34917fec1eba
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/lucene/licenses/spatial4j-0.6.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/spatial4j-0.6.jar.sha1 b/lucene/licenses/spatial4j-0.6.jar.sha1
deleted file mode 100644
index 56c02ad..0000000
--- a/lucene/licenses/spatial4j-0.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-21b15310bddcfd8c72611c180f20cf23279809a3
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/lucene/licenses/spatial4j-0.7-tests.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/spatial4j-0.7-tests.jar.sha1 b/lucene/licenses/spatial4j-0.7-tests.jar.sha1
new file mode 100644
index 0000000..0127b0f
--- /dev/null
+++ b/lucene/licenses/spatial4j-0.7-tests.jar.sha1
@@ -0,0 +1 @@
+1cf04898a92917fd038ac5a92490a8c415f671b9
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/lucene/licenses/spatial4j-0.7.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/spatial4j-0.7.jar.sha1 b/lucene/licenses/spatial4j-0.7.jar.sha1
new file mode 100644
index 0000000..ef24065
--- /dev/null
+++ b/lucene/licenses/spatial4j-0.7.jar.sha1
@@ -0,0 +1 @@
+faa8ba85d503da4ab872d17ba8c00da0098ab2f2
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/lucene/spatial-extras/ivy.xml
----------------------------------------------------------------------
diff --git a/lucene/spatial-extras/ivy.xml b/lucene/spatial-extras/ivy.xml
index 448776f..df67503 100644
--- a/lucene/spatial-extras/ivy.xml
+++ b/lucene/spatial-extras/ivy.xml
@@ -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}"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8ce41ef..26a596a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -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)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/solr/licenses/spatial4j-0.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/spatial4j-0.6.jar.sha1 b/solr/licenses/spatial4j-0.6.jar.sha1
deleted file mode 100644
index 56c02ad..0000000
--- a/solr/licenses/spatial4j-0.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-21b15310bddcfd8c72611c180f20cf23279809a3
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4700b1d3/solr/licenses/spatial4j-0.7.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/spatial4j-0.7.jar.sha1 b/solr/licenses/spatial4j-0.7.jar.sha1
new file mode 100644
index 0000000..ef24065
--- /dev/null
+++ b/solr/licenses/spatial4j-0.7.jar.sha1
@@ -0,0 +1 @@
+faa8ba85d503da4ab872d17ba8c00da0098ab2f2