caching framework cleanup and test extension
Change-Id: I472b0a465e3d2217835ffb1f49e07a1b65a08976
diff --git a/pom.xml b/pom.xml
index 116dd0e..63257bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Kustvakt-core</artifactId>
- <version>0.59.5</version>
+ <version>0.59.6</version>
<packaging>jar</packaging>
<name>Kustvakt core</name>
<description>Kustvakt core, basic rest api for testing purposes and default
@@ -86,6 +86,7 @@
<include>**/*.info</include>
<include>**/*.xml</include>
<include>**/*.conf</include>
+ <include>**/*.kustvakt</include>
<include>**/*.properties</include>
<include>**/*.sql</include>
</includes>
@@ -107,11 +108,8 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
- <!--<include>**/*.prop</include>-->
- <!--<include>**/*.xml</include>-->
<include>**/*.info</include>
<include>**/*.properties</include>
- <!--<include>**/*.sql</include>-->
</includes>
</testResource>
</testResources>
@@ -131,7 +129,7 @@
<compilerCompliance>1.7</compilerCompliance>
<compilerTargetPlatform>1.7</compilerTargetPlatform>
</configuration>
-
+ <!--
<executions>
<execution>
<goals>
@@ -139,7 +137,7 @@
</goals>
</execution>
</executions>
-
+ -->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -330,19 +328,19 @@
<artifactId>commons-dbcp2</artifactId>
<version>2.1.1</version>
</dependency>
-
+<!--
<dependency>
<groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId>
<version>2.1.0</version>
</dependency>
-<!--
+-->
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.4.0</version>
</dependency>
--->
+
<dependency>
<groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId>