Skip to content

Commit

Permalink
Merge branch 'master' into opPROX
Browse files Browse the repository at this point in the history
Change-Id: Id4c09edf57190ebda50f27a0c2ad84b9083a6ea1
  • Loading branch information
Bodmo committed Jan 13, 2024
2 parents 514e6aa + 5d686f8 commit e5dfaef
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
5 changes: 5 additions & 0 deletions Changes
@@ -1,6 +1,11 @@
0.42 2024-01-11
- [feature] Support #REG in C2 (bodmer)
- [bugfix] Fix comma in #BED in C2 (bodmer)

0.41 2023-09-13
- [feature] Finish support for CQP (irimia)
- [bugfix] Disallow empty regex in PQ+ (diewald)
- [cleanup] Change of groupID.

0.40 2023-07-26
- [feature] Initial support for CQP
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -132,7 +132,7 @@ J. Bingel and N. Diewald, "KoralQuery – a General Corpus Query Protocol," in P
## Authorship

Koral and KoralQuery were developed by Joachim Bingel,
Nils Diewald, Michael Hanl and Eliza Margaretha at the
Nils Diewald, Michael Hanl, Eliza Margaretha, and Franck Bodmer at the
[Leibniz Institute for the German Language (IDS)](https://www.ids-mannheim.de/),
member of the [Leibniz Association](https://www.leibniz-gemeinschaft.de).

Expand All @@ -142,7 +142,7 @@ The ANTLR grammars for parsing ANNIS QL and COSMAS II QL were developed by
Thomas Krause (HU Berlin) and Franck Bodmer (IDS Mannheim), respectively.
Minor adaptations of those grammars were implemented by the Koral authors.

The authors wish to thank Piotr Bański, Franck Bodmer, Elena Frick and
The authors wish to thank Piotr Bański, Elena Frick and
Carsten Schnober for their valuable input.

## License
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Expand Up @@ -2,9 +2,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>de.ids_mannheim.korap</groupId>
<groupId>de.ids-mannheim.korap.koral</groupId>
<artifactId>Koral</artifactId>
<version>0.41.0</version>
<version>0.42.0</version>
<packaging>jar</packaging>
<name>Koral</name>
<url>https://korap.ids-mannheim.de</url>
Expand Down Expand Up @@ -39,11 +39,11 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jackson.version>2.15.3</jackson.version>
<jackson.version>2.16.1</jackson.version>
<antlr4.version>4.9.3</antlr4.version>
<antlr3.version>3.5.3</antlr3.version>
<java.version>11</java.version>
<log4j.version>2.21.1</log4j.version>
<log4j.version>2.22.1</log4j.version>
</properties>

<repositories>
Expand Down Expand Up @@ -83,7 +83,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.3-jre</version>
<version>33.0.0-jre</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -145,7 +145,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.9</version>
<version>2.0.11</version>
</dependency>
<dependency>
<groupId>eu.clarin.sru.fcs</groupId>
Expand Down Expand Up @@ -191,7 +191,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.1</version>
<version>3.2.5</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
<excludes>
Expand All @@ -202,7 +202,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.12.1</version>
<configuration>
<!-- <verbose>true</verbose>
<fork>true</fork> -->
Expand Down

0 comments on commit e5dfaef

Please sign in to comment.