merge conflicts resolved.
Change-Id: Ia13f678a7a98956cd34c60cbe602b1183dc819de
diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml
index 7ad48e3..a2fab57 100644
--- a/.github/workflows/linux_ci.yml
+++ b/.github/workflows/linux_ci.yml
@@ -7,10 +7,11 @@
runs-on: ubuntu-latest
steps:
- name: Checkout Koral
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
- name: Set up JDK 11
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v4
with:
+ distribution: 'temurin'
java-version: 11
- name: Build and install Koral
diff --git a/.github/workflows/windows_ci.yml b/.github/workflows/windows_ci.yml
index 2409e1f..b39de98 100644
--- a/.github/workflows/windows_ci.yml
+++ b/.github/workflows/windows_ci.yml
@@ -11,10 +11,11 @@
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout Koral
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
- name: Set up JDK 11
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v4
with:
+ distribution: 'temurin'
java-version: 11
- name: Build and install Koral
diff --git a/pom.xml b/pom.xml
index 7b89fc9..64711a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,11 +39,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jackson.version>2.16.1</jackson.version>
+ <jackson.version>2.17.0</jackson.version>
<antlr4.version>4.9.3</antlr4.version>
<antlr3.version>3.5.3</antlr3.version>
<java.version>11</java.version>
- <log4j.version>2.22.1</log4j.version>
+ <log4j.version>2.23.1</log4j.version>
</properties>
<repositories>
@@ -83,7 +83,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>33.0.0-jre</version>
+ <version>33.1.0-jre</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -145,12 +145,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>2.0.11</version>
+ <version>2.0.13</version>
</dependency>
<dependency>
<groupId>eu.clarin.sru.fcs</groupId>
<artifactId>fcs-simple-endpoint</artifactId>
- <version>1.6.0</version>
+ <version>1.7.0</version>
</dependency>
</dependencies>
<build>
@@ -202,7 +202,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.12.1</version>
+ <version>3.13.0</version>
<configuration>
<!-- <verbose>true</verbose>
<fork>true</fork> -->
diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessor.java b/src/main/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessor.java
index 285a3e7..a6c7bd9 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessor.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/Cosmas2QueryProcessor.java
@@ -1844,12 +1844,14 @@
org.antlr.runtime.CommonTokenStream tokens =
new org.antlr.runtime.CommonTokenStream(lex); // v3
+ // System.out.printf("parseCosmasQuery: tokens = %d\n", tokens.size());
+ // System.out.printf("parseCosmasQuery: tokens = %s\n", tokens.toString());
+
parser = new c2psParser(tokens);
// Use custom error reporters
lex.setErrorReporter(errorListener);
((c2psParser) parser).setErrorReporter(errorListener);
-
c2psParser.c2ps_query_return c2Return =
((c2psParser) parser).c2ps_query(); // statt t().
diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java b/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java
index edc527e..deaa58e 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java
@@ -153,6 +153,7 @@
* 'poliqarpplus', 'cqp', 'cosmas2', 'annis' or 'cql'.
* @throws IOException
*/
+
public void run (String query, String queryLanguage, boolean bDebug) throws IOException {
ast.verbose = bDebug; // debugging: 01.09.23/FB