You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2021/04/11 19:23:26 UTC
[cassandra] branch trunk updated: Upgrade jflex to 1.8.2
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new e848d47 Upgrade jflex to 1.8.2
e848d47 is described below
commit e848d47ed171f20ccd8cf5e20d9e188ede85c17c
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Fri Apr 9 13:47:07 2021 +0200
Upgrade jflex to 1.8.2
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16576
---
.build/build-resolver.xml | 2 +-
CHANGES.txt | 1 +
build.xml | 3 ++-
.../apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex | 2 +-
.../cassandra/index/sasi/analyzer/StandardTokenizerInterface.java | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml
index dbce99d..f536dda 100644
--- a/.build/build-resolver.xml
+++ b/.build/build-resolver.xml
@@ -122,7 +122,7 @@
</resolve>
<resolve>
<dependencies>
- <dependency groupId="de.jflex" artifactId="jflex" version="1.6.0" />
+ <dependency groupId="de.jflex" artifactId="jflex" version="${jflex.version}" />
</dependencies>
<path refid="jflex.classpath" classpath="runtime"/>
</resolve>
diff --git a/CHANGES.txt b/CHANGES.txt
index 60c8d33..1ebd470 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0-rc1
+ * Upgrade jflex to 1.8.2 (CASSANDRA-16576)
* Binary releases no longer bundle the apidocs (javadoc) (CASSANDRA-15561)
* Fix Streaming Repair metrics (CASSANDRA-16190)
* Scheduled (delayed) schema pull tasks should not run after MIGRATION stage shutdown during decommission (CASSANDRA-16495)
diff --git a/build.xml b/build.xml
index b7c4c4e..b165595 100644
--- a/build.xml
+++ b/build.xml
@@ -122,6 +122,7 @@
<property name="asm.version" value="7.1"/>
<property name="allocation-instrumenter.version" value="3.1.0"/>
<property name="bytebuddy.version" value="1.10.10"/>
+ <property name="jflex.version" value="1.8.2"/>
<!-- https://mvnrepository.com/artifact/net.openhft/chronicle-bom/1.16.23 -->
<property name="chronicle-queue.version" value="5.20.123" />
@@ -615,7 +616,7 @@
<exclusion groupId="log4j" artifactId="log4j"/>
</dependency>
<dependency groupId="com.carrotsearch" artifactId="hppc" version="0.8.1" />
- <dependency groupId="de.jflex" artifactId="jflex" version="1.6.0">
+ <dependency groupId="de.jflex" artifactId="jflex" version="${jflex.version}">
<exclusion groupId="org.apache.ant" artifactId="ant"/>
</dependency>
<dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" />
diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex
index bdc35eb..86c6451 100644
--- a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex
+++ b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex
@@ -109,7 +109,7 @@ RegionalIndicatorEx = {RegionalIndicator}
public static final int HANGUL_TYPE = StandardAnalyzer.TokenType.HANGUL.value;
- public final int yychar()
+ public final long yychar()
{
return yychar;
}
diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerInterface.java b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerInterface.java
index 327a674..c12d7a1 100644
--- a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerInterface.java
+++ b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerInterface.java
@@ -35,7 +35,7 @@ public interface StandardTokenizerInterface
/**
* Returns the current position.
*/
- int yychar();
+ long yychar();
/**
* Returns the length of the matched text region.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org