Merge pull request #8 from KorAP/dependabot/maven/junit-junit-4.13.2
Bump junit from 4.13.1 to 4.13.2
diff --git a/.gitignore b/.gitignore
index ed3d86d..b89e895 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
.settings
target
out.json
+.factorypath
\ No newline at end of file
diff --git a/.mvn/local-settings.xml b/.mvn/local-settings.xml
new file mode 100644
index 0000000..175fdf9
--- /dev/null
+++ b/.mvn/local-settings.xml
@@ -0,0 +1,11 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 http://maven.apache.org/xsd/settings-1.2.0.xsd">
+ <mirrors>
+ <mirror>
+ <id>maven-default-http-blocker</id>
+ <mirrorOf>dummy</mirrorOf>
+ <name>Dummy mirror to override default blocking mirror that blocks http</name>
+ <url>http://0.0.0.0/</url>
+ </mirror>
+ </mirrors>
+</settings>
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 0000000..d97a699
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1 @@
+--settings ./.mvn/local-settings.xml
diff --git a/pom.xml b/pom.xml
index 22eea2e..e2d9a8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>de.mannheim.ids</groupId>
<artifactId>KorapSRU</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.0.5-SNAPSHOT</version>
<packaging>war</packaging>
<name>KorapSRU</name>
@@ -14,7 +14,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.10.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -35,7 +35,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey.version>1.19.4</jersey.version>
- <log4j.version>2.14.1</log4j.version>
+ <log4j.version>[2.17.1,)</log4j.version>
</properties>
<dependencies>
@@ -48,7 +48,7 @@
<dependency>
<groupId>eu.clarin.sru.fcs</groupId>
<artifactId>fcs-simple-endpoint</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -65,7 +65,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.12.2</version>
+ <version>2.13.2.1</version>
</dependency>
<dependency>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-netty</artifactId>
- <version>5.11.2</version>
+ <version>5.13.0</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -121,7 +121,7 @@
<repository>
<id>CLARIN</id>
<name>CLARIN Repository</name>
- <url>https://nexus.clarin.eu/content/repositories/Clarin</url>
+ <url>https://nexus.clarin.eu/content/repositories/Clarin/</url>
<layout>default</layout>
</repository>
</repositories>
diff --git a/src/main/java/de/ids_mannheim/korap/sru/KorapEndpointDescription.java b/src/main/java/de/ids_mannheim/korap/sru/KorapEndpointDescription.java
index f31718b..270f7dc 100644
--- a/src/main/java/de/ids_mannheim/korap/sru/KorapEndpointDescription.java
+++ b/src/main/java/de/ids_mannheim/korap/sru/KorapEndpointDescription.java
@@ -214,4 +214,19 @@
public void setTextLayer (Layer textLayer) {
this.textLayer = textLayer;
}
+
+ @Override
+ public int getVersion () {
+ return VERSION_2;
+ }
+
+ @Override
+ public boolean isVersion (int version) {
+ if(version == VERSION_2) {
+ return true;
+ }
+ else {
+ return false;
+ }
+ }
}