This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new e73a071 SOLR-16053: Upgrade scriptDepVersions
e73a071 is described below
commit e73a071c9a5590231a96d1bf829efdfd53390be1
Author: Kevin Risden <[email protected]>
AuthorDate: Wed Feb 23 10:50:50 2022 -0500
SOLR-16053: Upgrade scriptDepVersions
Upgrades
* apache-rat 0.11 -> 0.13
* ecj 3.27.0 -> 3.28.0
* javacc 7.0.4 -> 7.0.10
* jgit 5.9.0.202009080501-r -> 5.13.0.202109080827-r
* flexmark 0.61.24 -> 0.64.0
Addresses
* LUCENE-10240: gradle regenerate fails on java 17
* ecj new findings
* regenerate based on new javacc
* Removes duplicate scriptDepVersions definition from build.gradle and uses
buildSrc/scriptDepVersions.gradle
---
build.gradle | 23 +++++++--------
buildSrc/scriptDepVersions.gradle | 12 ++++----
gradle/generation/regenerate.gradle | 5 ++--
solr/CHANGES.txt | 4 +++
.../handler/designer/SampleDocumentsLoader.java | 1 -
.../org/apache/solr/parser/ParseException.java | 6 ++--
.../java/org/apache/solr/parser/QueryParser.java | 34 ++++++++++++----------
.../solr/parser/QueryParserTokenManager.java | 5 ++--
.../apache/solr/cloud/DistribCursorPagingTest.java | 1 -
.../org/apache/solr/handler/TestRequestId.java | 1 -
.../org/apache/solr/search/TestBlockCollapse.java | 1 -
.../solr/update/TestInPlaceUpdatesStandalone.java | 2 +-
.../test/org/apache/solr/update/UpdateLogTest.java | 2 +-
13 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/build.gradle b/build.gradle
index b1b9665..a4a01cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,18 +82,6 @@ ext {
minJavaVersion = JavaVersion.VERSION_11
- // Declare script dependency versions outside of palantir's
- // version unification control. These are not our main dependencies.
- scriptDepVersions = [
- "apache-rat": "0.11",
- "commons-codec": "1.15",
- "ecj": "3.19.0",
- "javacc": "7.0.4",
- "jflex": "1.7.0",
- "jgit": "5.9.0.202009080501-r",
- "flexmark": "0.61.24",
- ]
-
// Allow definiting external tool locations using system props.
externalTool = { name ->
def resolved = propertyOrDefault("${name}.exe", name as String)
@@ -113,6 +101,17 @@ ext {
}
}
+configurations {
+ groovy
+}
+
+dependencies {
+ // Use a newer groovy that doesn't have illegal reflective accesses.
+ groovy "org.codehaus.groovy:groovy-all:3.0.9"
+}
+
+apply from: file('buildSrc/scriptDepVersions.gradle')
+
// Include smaller chunks configuring dedicated build areas.
// Some of these intersect or add additional functionality.
// The order of inclusion of these files shouldn't matter (but may
diff --git a/buildSrc/scriptDepVersions.gradle
b/buildSrc/scriptDepVersions.gradle
index 3b3a64a..cdc130f 100644
--- a/buildSrc/scriptDepVersions.gradle
+++ b/buildSrc/scriptDepVersions.gradle
@@ -20,14 +20,12 @@
// but are reused in buildSrc and across applied scripts.
ext {
- // TODO: Check if Solr needs all of these
scriptDepVersions = [
- "apache-rat": "0.11",
+ "apache-rat": "0.13",
"commons-codec": "1.15",
- "ecj": "3.27.0",
- "flexmark": "0.61.24",
- "javacc": "7.0.4",
- "jflex": "1.8.2",
- "jgit": "5.9.0.202009080501-r",
+ "ecj": "3.28.0",
+ "javacc": "7.0.10",
+ "jgit": "5.13.0.202109080827-r",
+ "flexmark": "0.64.0",
]
}
diff --git a/gradle/generation/regenerate.gradle
b/gradle/generation/regenerate.gradle
index 5fc2845..541f05f 100644
--- a/gradle/generation/regenerate.gradle
+++ b/gradle/generation/regenerate.gradle
@@ -24,10 +24,11 @@ configure(rootProject) {
*/
modifyFile = { File path, Function<String, String> modify ->
Function<String, String> normalizeEols = { text -> text.replace("\r\n",
"\n") }
- modify = normalizeEols.andThen(modify).andThen(normalizeEols)
String original = path.getText("UTF-8")
- String modified = modify.apply(original)
+ String modified = normalizeEols.apply(original)
+ modified = modify.apply(modified)
+ modified = normalizeEols.apply(modified)
if (!original.equals(modified)) {
path.write(modified, "UTF-8")
}
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f774302..cd63015 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -38,6 +38,10 @@ Other Changes
* SOLR-15886: Remove deprecated showItems configuration value from
solrconfig.xml files (Andy Lester via Eric Pugh)
+Build
+---------------------
+* SOLR-16053: Upgrade scriptDepVersions (Kevin Risden)
+
================== 9.0.0 ==================
New Features
diff --git
a/solr/core/src/java/org/apache/solr/handler/designer/SampleDocumentsLoader.java
b/solr/core/src/java/org/apache/solr/handler/designer/SampleDocumentsLoader.java
index 0e0ba1c..69029b9 100644
---
a/solr/core/src/java/org/apache/solr/handler/designer/SampleDocumentsLoader.java
+++
b/solr/core/src/java/org/apache/solr/handler/designer/SampleDocumentsLoader.java
@@ -25,7 +25,6 @@ import java.util.UUID;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.ContentStream;
-import org.apache.solr.handler.designer.SampleDocuments;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.schema.StrField;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
diff --git a/solr/core/src/java/org/apache/solr/parser/ParseException.java
b/solr/core/src/java/org/apache/solr/parser/ParseException.java
index e36fdba..d08537d 100644
--- a/solr/core/src/java/org/apache/solr/parser/ParseException.java
+++ b/solr/core/src/java/org/apache/solr/parser/ParseException.java
@@ -65,7 +65,7 @@ public class ParseException extends Exception {
/**
* This is the last token that has been consumed successfully. If
* this object has been created due to a parse error, the token
- * followng this token will (therefore) be the first error token.
+ * following this token will (therefore) be the first error token.
*/
public Token currentToken;
@@ -122,7 +122,9 @@ public class ParseException extends Exception {
retval += " \"";
tok = tok.next;
}
- retval += "\" at line " + currentToken.next.beginLine + ", column " +
currentToken.next.beginColumn;
+ if (currentToken.next != null) {
+ retval += "\" at line " + currentToken.next.beginLine + ", column " +
currentToken.next.beginColumn;
+ }
retval += "." + EOL;
diff --git a/solr/core/src/java/org/apache/solr/parser/QueryParser.java
b/solr/core/src/java/org/apache/solr/parser/QueryParser.java
index 97be79a..11c5946 100644
--- a/solr/core/src/java/org/apache/solr/parser/QueryParser.java
+++ b/solr/core/src/java/org/apache/solr/parser/QueryParser.java
@@ -672,33 +672,33 @@ if (splitOnWhitespace == false) {
{
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_4()) {
+ if (jj_3R_Clause_249_7_4()) {
jj_scanpos = xsp;
- if (jj_3R_5()) return true;
+ if (jj_3R_Clause_250_9_5()) return true;
}
return false;
}
private boolean jj_3_2()
{
- if (jj_3R_3()) return true;
+ if (jj_3R_MultiTerm_327_3_3()) return true;
return false;
}
- private boolean jj_3R_5()
+ private boolean jj_3R_Clause_250_9_5()
{
if (jj_scan_token(STAR)) return true;
if (jj_scan_token(COLON)) return true;
return false;
}
- private boolean jj_3R_7()
+ private boolean jj_3R_MultiTerm_340_5_7()
{
if (jj_scan_token(TERM)) return true;
return false;
}
- private boolean jj_3R_4()
+ private boolean jj_3R_Clause_249_7_4()
{
if (jj_scan_token(TERM)) return true;
if (jj_scan_token(COLON)) return true;
@@ -707,27 +707,27 @@ if (splitOnWhitespace == false) {
private boolean jj_3_1()
{
- if (jj_3R_3()) return true;
+ if (jj_3R_MultiTerm_327_3_3()) return true;
return false;
}
- private boolean jj_3R_6()
+ private boolean jj_3R_MultiTerm_338_3_6()
{
return false;
}
- private boolean jj_3R_3()
+ private boolean jj_3R_MultiTerm_327_3_3()
{
if (jj_scan_token(TERM)) return true;
jj_lookingAhead = true;
jj_semLA = getToken(1).kind == TERM &&
allowedPostMultiTerm(getToken(2).kind);
jj_lookingAhead = false;
- if (!jj_semLA || jj_3R_6()) return true;
+ if (!jj_semLA || jj_3R_MultiTerm_338_3_6()) return true;
Token xsp;
- if (jj_3R_7()) return true;
+ if (jj_3R_MultiTerm_340_5_7()) return true;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_7()) { jj_scanpos = xsp; break; }
+ if (jj_3R_MultiTerm_340_5_7()) { jj_scanpos = xsp; break; }
}
return false;
}
@@ -828,8 +828,13 @@ if (splitOnWhitespace == false) {
}
@SuppressWarnings("serial")
- static private final class LookaheadSuccess extends java.lang.Error { }
- static final private LookaheadSuccess jj_ls = new LookaheadSuccess();
+ static private final class LookaheadSuccess extends java.lang.Error {
+ @Override
+ public Throwable fillInStackTrace() {
+ return this;
+ }
+ }
+ static private final LookaheadSuccess jj_ls = new LookaheadSuccess();
private boolean jj_scan_token(int kind) {
if (jj_scanpos == jj_lastpos) {
jj_la--;
@@ -959,7 +964,6 @@ if (splitOnWhitespace == false) {
return new ParseException(token, exptokseq, tokenImage);
}
- private int trace_indent = 0;
private boolean trace_enabled;
/** Trace enabled. */
diff --git
a/solr/core/src/java/org/apache/solr/parser/QueryParserTokenManager.java
b/solr/core/src/java/org/apache/solr/parser/QueryParserTokenManager.java
index 323a3ef..fd4dba8 100644
--- a/solr/core/src/java/org/apache/solr/parser/QueryParserTokenManager.java
+++ b/solr/core/src/java/org/apache/solr/parser/QueryParserTokenManager.java
@@ -17,6 +17,7 @@ package org.apache.solr.parser;
/** Token Manager. */
+@SuppressWarnings ("unused")
public class QueryParserTokenManager implements QueryParserConstants {
int commentNestingDepth ;
@@ -1349,9 +1350,7 @@ protected Token jjFillToken()
beginColumn = input_stream.getBeginColumn();
endLine = input_stream.getEndLine();
endColumn = input_stream.getEndColumn();
- t = Token.newToken(jjmatchedKind);
- t.kind = jjmatchedKind;
- t.image = curTokenImage;
+ t = Token.newToken(jjmatchedKind, curTokenImage);
t.beginLine = beginLine;
t.endLine = endLine;
diff --git
a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
index 89b4971..fb09152 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
@@ -24,7 +24,6 @@ import org.apache.solr.CursorPagingTest;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.LukeRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.cloud.ZkTestServer;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
diff --git a/solr/core/src/test/org/apache/solr/handler/TestRequestId.java
b/solr/core/src/test/org/apache/solr/handler/TestRequestId.java
index 8390d7f..8521e9e 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestRequestId.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestRequestId.java
@@ -23,7 +23,6 @@ import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.SuppressForbidden;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.util.LogListener;
import org.apache.solr.SolrTestCaseJ4;
diff --git a/solr/core/src/test/org/apache/solr/search/TestBlockCollapse.java
b/solr/core/src/test/org/apache/solr/search/TestBlockCollapse.java
index a9de149..ba15351 100644
--- a/solr/core/src/test/org/apache/solr/search/TestBlockCollapse.java
+++ b/solr/core/src/test/org/apache/solr/search/TestBlockCollapse.java
@@ -31,7 +31,6 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.search.PostFilter;
import org.junit.After;
import org.junit.BeforeClass;
diff --git
a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
index f61ad6c..1b777eb 100644
---
a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
+++
b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
@@ -1305,7 +1305,7 @@ public class TestInPlaceUpdatesStandalone extends
SolrTestCaseJ4 {
@Test
/**
- * Test the @see {@link
AtomicUpdateDocumentMerger#doInPlaceUpdateMerge(AddUpdateCommand,Set<String>)}
+ * Test the @see {@link
AtomicUpdateDocumentMerger#doInPlaceUpdateMerge(AddUpdateCommand,Set)}
* method is working fine
*/
public void testDoInPlaceUpdateMerge() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
b/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
index 9c0bb40..b9d9e4c 100644
--- a/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
+++ b/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
@@ -60,7 +60,7 @@ public class UpdateLogTest extends SolrTestCaseJ4 {
@Test
/**
- * @see
org.apache.solr.update.UpdateLog#applyPartialUpdates(BytesRef,long,long,SolrDocumentBase)
+ * @see org.apache.solr.update.UpdateLog#applyPartialUpdates
*/
public void testApplyPartialUpdatesOnMultipleInPlaceUpdatesInSequence() {
// Add a full update, two in-place updates and verify applying partial
updates is working
