Merge branch 'main' into develop

knaw-huc · Sep 26, 2023 · 11213e1 · 11213e1
2 parents abbaf76 + fc06044
commit 11213e1
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>io.github.knaw-huc</groupId>
         <artifactId>annorepo</artifactId>
-        <version>0.5.4-SNAPSHOT</version>
+        <version>0.5.5</version>
     </parent>
 
     <dependencyManagement>

diff --git a/client/readme.md b/client/readme.md
@@ -14,7 +14,7 @@ Add the following to your `pom.xml`
 <dependency>
     <groupId>io.github.knaw-huc</groupId>
     <artifactId>annorepo-client</artifactId>
-    <version>0.5.4-SNAPSHOT</version>
+    <version>0.5.5</version>
 </dependency>
 ```
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>io.github.knaw-huc</groupId>
         <artifactId>annorepo</artifactId>
-        <version>0.5.4-SNAPSHOT</version>
+        <version>0.5.5</version>
     </parent>
 
     <artifactId>annorepo-common</artifactId>
-    <version>0.5.4-SNAPSHOT</version>
+    <version>0.5.5</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Shared libraries/classes/methods for AnnoRepo</description>

diff --git a/integration-test/pom.xml b/integration-test/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>io.github.knaw-huc</groupId>
         <artifactId>annorepo</artifactId>
-        <version>0.5.4-SNAPSHOT</version>
+        <version>0.5.5</version>
     </parent>
 
     <artifactId>annorepo-integration-test</artifactId>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>0.5.4-SNAPSHOT</version>
+    <version>0.5.5</version>
 
     <properties>
         <mainClass>nl.knaw.huc.annorepo.integration.IntegrationTest</mainClass>

diff --git a/k8s/annorepo-server/Dockerfile b/k8s/annorepo-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:22-jdk-slim-bullseye
+FROM openjdk:22-ea-12-jdk-slim
 
 RUN apt update && \
     apt install -y curl && \

diff --git a/k8s/annorepo-server/Dockerfile-multistage b/k8s/annorepo-server/Dockerfile-multistage
@@ -9,7 +9,7 @@ COPY ./pom.xml /build/
 COPY ./config.yml config.yml
 RUN mvn --projects server --no-transfer-progress --batch-mode --update-snapshots --also-make package
 
-FROM openjdk:22-jdk-slim
+FROM openjdk:20-rc-jdk-slim
 
 WORKDIR /apps/annorepo
 COPY --from=builder /build/server/target/annorepo-server-*.jar /apps/annorepo/annorepo-server.jar

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>io.github.knaw-huc</groupId>
     <artifactId>annorepo</artifactId>
-    <version>0.5.4-SNAPSHOT</version>
+    <version>0.5.5</version>
     <packaging>pom</packaging>
 
     <name>AnnoRepo</name>
@@ -26,7 +26,7 @@
         <!-- Timestamp settings for use in properties file -->
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
 
-        <kotlin.version>1.9.0</kotlin.version>
+        <kotlin.version>1.9.10</kotlin.version>
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
@@ -48,7 +48,7 @@
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <jena.version>4.9.0</jena.version>
         <json.version>20230227</json.version>
-        <kotlinx-cli-jvm.version>0.3.5</kotlinx-cli-jvm.version>
+        <kotlinx-cli-jvm.version>0.3.6</kotlinx-cli-jvm.version>
         <kmongo.version>4.9.0</kmongo.version>
         <mongodb.version>4.10.0</mongodb.version>
         <mordant.version>2.1.0</mordant.version>

diff --git a/server/pom.xml b/server/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>io.github.knaw-huc</groupId>
         <artifactId>annorepo</artifactId>
-        <version>0.5.4-SNAPSHOT</version>
+        <version>0.5.5</version>
     </parent>
 
     <properties>

diff --git a/server/src/main/kotlin/nl/knaw/huc/annorepo/resources/tools/AggregateStageGenerator.kt b/server/src/main/kotlin/nl/knaw/huc/annorepo/resources/tools/AggregateStageGenerator.kt
@@ -94,8 +94,8 @@ class AggregateStageGenerator(val configuration: AnnoRepoConfiguration) {
                     Filters.and(
                         Filters.eq("${ANNOTATION_FIELD_PREFIX}target.source", rangeParameters.source),
                         Filters.eq("${ANNOTATION_FIELD_PREFIX}target.selector.type", configuration.rangeSelectorType),
-                        Filters.lt("${ANNOTATION_FIELD_PREFIX}target.selector.start", rangeParameters.end),
-                        Filters.gt("${ANNOTATION_FIELD_PREFIX}target.selector.end", rangeParameters.start),
+                        Filters.lte("${ANNOTATION_FIELD_PREFIX}target.selector.start", rangeParameters.end),
+                        Filters.gte("${ANNOTATION_FIELD_PREFIX}target.selector.end", rangeParameters.start),
                     )
                 )
             }

diff --git a/server/src/test/kotlin/nl/knaw/huc/annorepo/resources/tools/AggregateStageGeneratorTest.kt b/server/src/test/kotlin/nl/knaw/huc/annorepo/resources/tools/AggregateStageGeneratorTest.kt
@@ -290,8 +290,8 @@ class AggregateStageGeneratorTest {
                   "@and": [
                      { "annotation.target.source": "$source"},
                      { "annotation.target.selector.type": "$selector"},
-                     { "annotation.target.selector.start": { "@lt": ${end.toFloat()} } },
-                     { "annotation.target.selector.end":   { "@gt": ${start.toFloat()} } }
+                     { "annotation.target.selector.start": { "@lte": ${end.toFloat()} } },
+                     { "annotation.target.selector.end":   { "@gte": ${start.toFloat()} } }
                   ]
                }
             }""".trimIndent().replace('@', '$')