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/09 10:02:23 UTC
[lucene-solr] branch gradle-master updated (eeb1c9a -> eea3c1e)
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 eeb1c9a Only print the slowest tests at the end of a successful run. Correct verbose mode to parse string switch correctly.
add 7c8635d6 SOLR-14028: Fix test permissions for TestSolrCLIRunExample
add f9e1583 SOLR-13987: Admin UI should not rely on javascript eval()
add 07e4d86 SOLR-13818: Upgrade jackson to 2.10.0
add 8e9876f SOLR-7798: robust support for expand when used w/o collapsing (#325)
add df508ff SOLR-11706: fix for multivalued trie date in min/max and more tests
add 7900712 LUCENE-9085: Fix assertion in CharacterUtils (#1067)
add 0d78535 SOLR-13977: Move changes entry to 8.4
new a6d7017 Merge remote-tracking branch 'origin/master' into gradle-master
new eea3c1e Merging with master. Add deps help links.
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:
help/dependencies.txt | 28 ++++++++--
lucene/common-build.xml | 1 -
.../org/apache/lucene/analysis/CharacterUtils.java | 4 +-
.../apache/lucene/analysis/TestCharacterUtils.java | 11 ++++
lucene/ivy-versions.properties | 4 +-
lucene/tools/junit4/solr-tests.policy | 2 +-
solr/CHANGES.txt | 9 ++-
.../solr/handler/component/ExpandComponent.java | 35 ++++++------
.../org/apache/solr/search/facet/MinMaxAgg.java | 12 +++-
.../java/org/apache/solr/util/SimplePostTool.java | 64 ++++++++++++++--------
.../handler/component/TestExpandComponent.java | 13 +++++
...stributedFacetSimpleRefinementLongTailTest.java | 21 ++++++-
.../apache/solr/search/facet/TestJsonFacets.java | 44 +++++++--------
solr/licenses/jackson-annotations-2.10.0.jar.sha1 | 1 +
solr/licenses/jackson-annotations-2.9.9.jar.sha1 | 1 -
solr/licenses/jackson-core-2.10.0.jar.sha1 | 1 +
solr/licenses/jackson-core-2.9.9.jar.sha1 | 1 -
solr/licenses/jackson-databind-2.10.0.jar.sha1 | 1 +
solr/licenses/jackson-databind-2.9.9.3.jar.sha1 | 1 -
.../jackson-dataformat-smile-2.10.0.jar.sha1 | 1 +
.../jackson-dataformat-smile-2.9.9.jar.sha1 | 1 -
solr/server/etc/jetty.xml | 14 ++++-
.../web/css/angular/angular-csp.css} | 22 +++++++-
solr/webapp/web/index.html | 3 +-
solr/webapp/web/js/angular/app.js | 2 +-
solr/webapp/web/js/angular/controllers/cloud.js | 2 +-
versions.lock | 8 +--
versions.props | 2 +-
28 files changed, 210 insertions(+), 99 deletions(-)
create mode 100644 solr/licenses/jackson-annotations-2.10.0.jar.sha1
delete mode 100644 solr/licenses/jackson-annotations-2.9.9.jar.sha1
create mode 100644 solr/licenses/jackson-core-2.10.0.jar.sha1
delete mode 100644 solr/licenses/jackson-core-2.9.9.jar.sha1
create mode 100644 solr/licenses/jackson-databind-2.10.0.jar.sha1
delete mode 100644 solr/licenses/jackson-databind-2.9.9.3.jar.sha1
create mode 100644 solr/licenses/jackson-dataformat-smile-2.10.0.jar.sha1
delete mode 100644 solr/licenses/jackson-dataformat-smile-2.9.9.jar.sha1
copy solr/{licenses/java-semver-LICENSE-MIT.txt => webapp/web/css/angular/angular-csp.css} (70%)
[lucene-solr] 02/02: Merging with master. Add deps help links.
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 eea3c1e472baa4a5f5d1872c1a2b4519a74cd885
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Mon Dec 9 11:02:13 2019 +0100
Merging with master. Add deps help links.
---
help/dependencies.txt | 28 +++++++++++++++++++++++-----
versions.lock | 8 ++++----
versions.props | 2 +-
3 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/help/dependencies.txt b/help/dependencies.txt
index b68750c..4490d73 100644
--- a/help/dependencies.txt
+++ b/help/dependencies.txt
@@ -9,7 +9,9 @@ adds standard configurations such as "api", "implementation",
"testImplementation" and others. These configurations can also inherit
from each other; more about this typic can be found here:
-[TODO: add conigurations link, java plugin configs]
+https://docs.gradle.org/current/userguide/dependency_management_for_java_projects.html#dependency_management_for_java_projects
+https://docs.gradle.org/current/userguide/java_library_plugin.html#sec:java_library_separation
+https://docs.gradle.org/current/userguide/java_plugin.html#sec:java_plugin_and_dependency_management
For the needs of Lucene and Solr we will typically focus on three
configurations and attach project dependencies to them:
@@ -21,8 +23,7 @@ implementation - makes a dependency available for main classes, tests
but will *not* export the dependency for other modules (so their
compilation classpath won't contain it).
-testImplementation - makes a dependency only available for test
- classes.
+testImplementation - makes a dependency only available for test classes.
Adding a library dependency
@@ -59,7 +60,24 @@ gradlew --write-locks
IMPORTANT: The versions.lock file will contain the actual version
of the dependency picked based on other project dependencies and
-their transitive dependencies.
+their transitive dependencies. This selected version may be
+different from what each of these actually requires (the highest
+version number will be typically selected). To see which dependencies
+require which version of the library use:
+
+gradlew why --hash=...
+
+where the hash code comes from versions.lock file. For example, at
+the time of writing, jackson-databind has the following entry:
+
+com.fasterxml.jackson.core:jackson-databind:2.10.0 (3 constraints: 931a7796)
+
+and gradlew why --hash=931a7796 prints:
+
+com.fasterxml.jackson.core:jackson-databind:2.10.0
+ projects -> 2.10.0
+ net.thisptr:jackson-jq -> 2.7.0
+ org.carrot2:carrot2-mini -> 2.9.9.3
Once the dependency is added it always makes sense to see the
tree of all module dependencies and maybe exclude transitive
@@ -103,4 +121,4 @@ dependencies {
}
Note the brackets - they are important and prevent accidental
-mistakes of applying the exclusion to the wrong scope.
\ No newline at end of file
+mistakes of applying the exclusion to the wrong scope.
diff --git a/versions.lock b/versions.lock
index d02ff02..be4c5eb 100644
--- a/versions.lock
+++ b/versions.lock
@@ -7,10 +7,10 @@ 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.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.jackson.core:jackson-annotations:2.10.0 (2 constraints: 321dab4e)
+com.fasterxml.jackson.core:jackson-core:2.10.0 (3 constraints: 6135ffb6)
+com.fasterxml.jackson.core:jackson-databind:2.10.0 (3 constraints: 931a7796)
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.10.0 (1 constraints: 35052f3b)
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)
diff --git a/versions.props b/versions.props
index bbca163..94f74db 100644
--- a/versions.props
+++ b/versions.props
@@ -4,7 +4,7 @@ com.carrotsearch:hppc=0.8.1
com.cybozu.labs:langdetect=1.1-20120112
com.drewnoakes:metadata-extractor=2.11.0
com.epam:parso=2.0.9
-com.fasterxml.jackson*:*=2.9.9
+com.fasterxml.jackson*:*=2.10.0
com.fasterxml.woodstox:*=4.4.1
com.github.ben-manes.caffeine:caffeine=2.8.0
com.github.virtuald:curvesapi=1.04
[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 a6d7017f2ecabfcb9e2f73c408f41e0c7411f89c
Merge: eeb1c9a 0d78535
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Mon Dec 9 10:55:54 2019 +0100
Merge remote-tracking branch 'origin/master' into gradle-master
lucene/common-build.xml | 1 -
.../org/apache/lucene/analysis/CharacterUtils.java | 4 +-
.../apache/lucene/analysis/TestCharacterUtils.java | 11 ++++
lucene/ivy-versions.properties | 4 +-
lucene/tools/junit4/solr-tests.policy | 2 +-
solr/CHANGES.txt | 9 ++-
.../solr/handler/component/ExpandComponent.java | 35 ++++++------
.../org/apache/solr/search/facet/MinMaxAgg.java | 12 +++-
.../java/org/apache/solr/util/SimplePostTool.java | 64 ++++++++++++++--------
.../handler/component/TestExpandComponent.java | 13 +++++
...stributedFacetSimpleRefinementLongTailTest.java | 21 ++++++-
.../apache/solr/search/facet/TestJsonFacets.java | 44 +++++++--------
solr/licenses/jackson-annotations-2.10.0.jar.sha1 | 1 +
solr/licenses/jackson-annotations-2.9.9.jar.sha1 | 1 -
solr/licenses/jackson-core-2.10.0.jar.sha1 | 1 +
solr/licenses/jackson-core-2.9.9.jar.sha1 | 1 -
solr/licenses/jackson-databind-2.10.0.jar.sha1 | 1 +
solr/licenses/jackson-databind-2.9.9.3.jar.sha1 | 1 -
.../jackson-dataformat-smile-2.10.0.jar.sha1 | 1 +
.../jackson-dataformat-smile-2.9.9.jar.sha1 | 1 -
solr/server/etc/jetty.xml | 14 ++++-
solr/webapp/web/css/angular/angular-csp.css | 41 ++++++++++++++
solr/webapp/web/index.html | 3 +-
solr/webapp/web/js/angular/app.js | 2 +-
solr/webapp/web/js/angular/controllers/cloud.js | 2 +-
25 files changed, 202 insertions(+), 88 deletions(-)