Integrated lite and full services and controllers in core.
Change-Id: I34914c89c2266fa02bee1a5b0522c46139b13966
diff --git a/full/pom.xml b/full/pom.xml
index ba18faf..71252ac 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Kustvakt-full</artifactId>
- <version>0.61.3</version>
+ <version>0.61.4</version>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -185,7 +185,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
<configuration>
- <useSystemClassLoader>false</useSystemClassLoader>
+ <useSystemClassLoader>false</useSystemClassLoader>
<reuseForks>true</reuseForks>
<forkCount>1</forkCount>
<threadCount>10</threadCount>
@@ -208,7 +208,7 @@
<dependency>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Kustvakt-core</artifactId>
- <version>0.61.3</version>
+ <version>[0.61.4,)</version>
</dependency>
<!-- LDAP -->
<dependency>
@@ -251,12 +251,6 @@
<version>${hibernate.version}</version>
</dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.22.0-GA</version>
- </dependency>
-
<!-- MySql -->
<dependency>
<groupId>mysql</groupId>
@@ -278,34 +272,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey.version}</version>
- </dependency>
-
- <!-- Spring -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring-framework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring-framework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring-framework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>${spring-framework.version}</version>
- </dependency>
-
<!-- velocity -->
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -329,13 +295,6 @@
<version>1.1.1</version>
</dependency>
- <!-- Flyway -->
- <dependency>
- <groupId>org.flywaydb</groupId>
- <artifactId>flyway-core</artifactId>
- <version>4.0</version>
- </dependency>
-
<!-- OAuth -->
<dependency>
<groupId>org.apache.oltu.oauth2</groupId>