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 2020/01/15 09:40:49 UTC
[lucene-solr] branch gradle-master updated (c9e7eeb -> ae2e4f3)
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 c9e7eeb Add RAT check using Gradle (#1157)
add 767e97b DOAP changes for release 8.4.1
add e3f3f3bb Add bugfix version 8.4.1
add 3e3a0f9 Add back-compat indices for 8.4.1
add 5cf1ffe SOLR-12490: Describe json.queries in the ref guide. Link it from many pages. Fix a few errors by the way.
add 5677060 LUCENE-9117: RamUsageEstimator hangs with AOT compilation. Removed any attempt to estimate Long.valueOf cache size: there will be some resulting overestimation but it shouldn't be harmful.
new 08d2c2d Merge remote-tracking branch 'origin/master' into gradle-master
new 0e686c6 Merge branch 'gradle-master' of https://gitbox.apache.org/repos/asf/lucene-solr into gradle-master
new e6d85cd Cleaning up minor things in rat task.
new ae2e4f3 Add git help to help/
The 4 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:
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
gradle/help.gradle | 1 +
gradle/validation/rat-sources.gradle | 146 ++++++++++-----------
dev-tools/git/HELP.txt => help/git.txt | 2 +-
lucene/CHANGES.txt | 6 +
.../lucene/index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.8.4.1-cfs.zip | Bin 0 -> 25194 bytes
.../org/apache/lucene/index/index.8.4.1-nocfs.zip | Bin 0 -> 15523 bytes
.../test/org/apache/lucene/index/sorted.8.4.1.zip | Bin 0 -> 138153 bytes
.../src/java/org/apache/lucene/util/Version.java | 7 +
.../src/common-query-parameters.adoc | 2 +-
.../src/json-faceting-domain-changes.adoc | 41 +++++-
solr/solr-ref-guide/src/json-query-dsl.adoc | 21 +++
solr/solr-ref-guide/src/json-request-api.adoc | 11 +-
solr/solr-ref-guide/src/searching.adoc | 2 +-
16 files changed, 171 insertions(+), 89 deletions(-)
copy dev-tools/git/HELP.txt => help/git.txt (85%)
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.4.1-cfs.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.4.1-nocfs.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.8.4.1.zip
[lucene-solr] 01/04: 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 08d2c2d0df7d030a2f68e63e2660ee7f38d1a3cf
Merge: fb5ba8c 5677060
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Wed Jan 15 09:54:45 2020 +0100
Merge remote-tracking branch 'origin/master' into gradle-master
dev-tools/doap/lucene.rdf | 7 ++++
dev-tools/doap/solr.rdf | 7 ++++
lucene/CHANGES.txt | 6 +++
.../lucene/index/TestBackwardsCompatibility.java | 7 +++-
.../org/apache/lucene/index/index.8.4.1-cfs.zip | Bin 0 -> 25194 bytes
.../org/apache/lucene/index/index.8.4.1-nocfs.zip | Bin 0 -> 15523 bytes
.../test/org/apache/lucene/index/sorted.8.4.1.zip | Bin 0 -> 138153 bytes
.../src/java/org/apache/lucene/util/Version.java | 7 ++++
.../src/common-query-parameters.adoc | 2 +-
.../src/json-faceting-domain-changes.adoc | 41 ++++++++++++++++++++-
solr/solr-ref-guide/src/json-query-dsl.adoc | 21 +++++++++++
solr/solr-ref-guide/src/json-request-api.adoc | 11 +++++-
solr/solr-ref-guide/src/searching.adoc | 2 +-
13 files changed, 103 insertions(+), 8 deletions(-)
[lucene-solr] 02/04: Merge branch 'gradle-master' of
https://gitbox.apache.org/repos/asf/lucene-solr 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 0e686c6701a7ea53def205c145c786c73610f9d2
Merge: 08d2c2d c9e7eeb
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Wed Jan 15 09:56:15 2020 +0100
Merge branch 'gradle-master' of https://gitbox.apache.org/repos/asf/lucene-solr into gradle-master
build.gradle | 1 +
gradle/validation/precommit.gradle | 1 +
gradle/validation/rat-sources.gradle | 266 ++++++++++++++++++++++
gradle/validation/validate-source-patterns.gradle | 16 +-
versions.props | 1 +
5 files changed, 277 insertions(+), 8 deletions(-)
[lucene-solr] 04/04: Add git help to help/
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 ae2e4f3ae9bbcb941db4af1a7f31c6d8d7ad63df
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Wed Jan 15 10:40:41 2020 +0100
Add git help to help/
---
gradle/help.gradle | 1 +
help/git.txt | 14 ++++++++++++++
2 files changed, 15 insertions(+)
diff --git a/gradle/help.gradle b/gradle/help.gradle
index e526389..85112ff 100644
--- a/gradle/help.gradle
+++ b/gradle/help.gradle
@@ -8,6 +8,7 @@ configure(rootProject) {
["Deps", "help/dependencies.txt", "Declaring, inspecting and excluding dependencies."],
["ForbiddenApis", "help/forbiddenApis.txt", "How to add/apply rules for forbidden APIs."],
["LocalSettings", "help/localSettings.txt", "Local settings, overrides and build performance tweaks."],
+ ["Git", "help/git.txt", "Git assistance and guides."],
]
helpFiles.each { section, path, sectionInfo ->
diff --git a/help/git.txt b/help/git.txt
new file mode 100644
index 0000000..299415a
--- /dev/null
+++ b/help/git.txt
@@ -0,0 +1,14 @@
+A list of resources that may be helpful for those learning git:
+
+ - Dawid's task-oriented help:
+ https://github.com/dweiss/lucene-git-guides
+
+ - git for computer scientists (a nice writeup on how git is essentially a graph
+ of commits and labels attached to those commits):
+ https://eagain.net/articles/git-for-computer-scientists/
+
+ - git pro (book)
+ https://git-scm.com/book/en/v2
+
+ - git workflows, their pros and cons:
+ https://help.github.com/articles/what-is-a-good-git-workflow/
[lucene-solr] 03/04: Cleaning up minor things in rat task.
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 e6d85cd4bc4f4798ff75e16fd305af0a4de74589
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Wed Jan 15 10:07:10 2020 +0100
Cleaning up minor things in rat task.
---
gradle/validation/rat-sources.gradle | 146 ++++++++++++++++-------------------
1 file changed, 66 insertions(+), 80 deletions(-)
diff --git a/gradle/validation/rat-sources.gradle b/gradle/validation/rat-sources.gradle
index 90291e6..841ad9d 100644
--- a/gradle/validation/rat-sources.gradle
+++ b/gradle/validation/rat-sources.gradle
@@ -21,11 +21,11 @@ import groovy.xml.NamespaceBuilder
configure(rootProject) {
configurations {
- rat
+ ratDeps
}
dependencies {
- rat "org.apache.rat:apache-rat"
+ ratDeps "org.apache.rat:apache-rat"
}
}
@@ -34,98 +34,84 @@ allprojects {
group = 'Verification'
description = 'Runs Apache Rat checks.'
}
+}
- if (project == rootProject) {
- rat {
- includes += [
- "buildSrc/**/*.java",
- "lucene/tools/forbiddenApis/**",
- "lucene/tools/prettify/**",
- // "dev-tools/**"
- ]
- excludes += [
- // Unclear if this needs ASF header, depends on how much was copied from ElasticSearch
- "**/ErrorReportingTestListener.java"
- ]
- }
+configure(rootProject) {
+ rat {
+ includes += [
+ "buildSrc/**/*.java",
+ "lucene/tools/forbiddenApis/**",
+ "lucene/tools/prettify/**",
+ ]
+ excludes += [
+ // Unclear if this needs ASF header, depends on how much was copied from ElasticSearch
+ "**/ErrorReportingTestListener.java"
+ ]
}
+}
- if (project.path == ":lucene:analysis:common") {
- rat {
- srcExcludes += [
- "**/*.aff",
- "**/*.dic",
- "**/charfilter/*.htm*",
- "**/*LuceneResourcesWikiPage.html"
- ]
- }
+configure(project(":lucene:analysis:common")) {
+ rat {
+ srcExcludes += [
+ "**/*.aff",
+ "**/*.dic",
+ "**/charfilter/*.htm*",
+ "**/*LuceneResourcesWikiPage.html"
+ ]
}
+}
- if (project.path == ":lucene:analysis:kuromoji") {
- rat {
- srcExcludes += [
- // whether rat detects this as binary or not is platform dependent?!
- "**/bocchan.utf-8"
- ]
- }
+configure(project(":lucene:analysis:kuromoji")) {
+ rat {
+ srcExcludes += [
+ // whether rat detects this as binary or not is platform dependent?!
+ "**/bocchan.utf-8"
+ ]
}
+}
- if (project.path == ":lucene:analysis:opennlp") {
- rat {
- excludes += [
- "src/tools/test-model-data/*.txt",
- ]
- }
- }
-
- if (project.path == ":lucene:highlighter") {
- rat {
- srcExcludes += [
- "**/CambridgeMA.utf8"
- ]
- }
+configure(project(":lucene:analysis:opennlp")) {
+ rat {
+ excludes += [
+ "src/tools/test-model-data/*.txt",
+ ]
}
+}
- if (project.path == ":lucene:suggest") {
- rat {
- srcExcludes += [
- "**/Top50KWiki.utf8",
- "**/stop-snowball.txt"
- ]
- }
+configure(project(":lucene:highlighter")) {
+ rat {
+ srcExcludes += [
+ "**/CambridgeMA.utf8"
+ ]
}
+}
- if (project.path == ":lucene:tools") {
- rat {
- includes += [
- "forbiddenApis/**",
- "prettify/**",
- // If/when :lucene:tools becomes a gradle project, then the following line will fail
- // It is safe to remove it, but also remove the check for lucene/tools in rootProject above
- "javadoc/ecj.javadocs.prefs"
- ]
- }
+configure(project(":lucene:suggest")) {
+ rat {
+ srcExcludes += [
+ "**/Top50KWiki.utf8",
+ "**/stop-snowball.txt"
+ ]
}
+}
-
- if (project.path == ":solr:core") {
- rat {
- srcExcludes += [
- "**/htmlStripReaderTest.html"
- ]
- }
+configure(project(":solr:core")) {
+ rat {
+ srcExcludes += [
+ "**/htmlStripReaderTest.html"
+ ]
}
+}
- if (project.path == ":solr:webapp") {
- rat {
- includes = [ "**" ]
- excludes += [
- "web/img/**",
- "*.iml",
- "build.gradle",
- "build/**",
- ]
- }
+configure(project(":solr:webapp")) {
+ rat {
+ includes = [ "**" ]
+ excludes += [
+ "web/img/**",
+ "*.iml",
+ "build.gradle",
+ "build/**",
+ ]
}
}
@@ -154,7 +140,7 @@ class RatTask extends DefaultTask {
def generateXmlReport() {
def uri = 'antlib:org.apache.rat.anttasks'
- def ratClasspath = project.rootProject.configurations.rat.asPath
+ def ratClasspath = project.rootProject.configurations.ratDeps.asPath
ant.taskdef(resource: 'org/apache/rat/anttasks/antlib.xml', uri: uri, classpath: ratClasspath)
def rat = NamespaceBuilder.newInstance(ant, uri)