Resolved duplicate libraries.
Change-Id: I72f4336763507bd38348a0ce755589b791a56d1f
diff --git a/full/Changes b/full/Changes
index 2b3bae0..ce46822 100644
--- a/full/Changes
+++ b/full/Changes
@@ -9,6 +9,7 @@
- Make sure totalResults and other numeric results are numbers (Kupietz)
- Introduce CQP query language in Koral 0.41
- Changed DB connection (fixed #670)
+- Resolved duplicate libraries.
# version 0.70.1
diff --git a/full/pom.xml b/full/pom.xml
index 546165b..194e4e6 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -375,11 +375,6 @@
<version>4.13.2</version>
</dependency>
<dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.28</version>
- </dependency>
- <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.12.5</version>
@@ -615,21 +610,45 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-java8</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-c3p0</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+
+ <!-- Sqlite -->
+ <dependency>
<groupId>com.github.gwenn</groupId>
<artifactId>sqlite-dialect</artifactId>
<version>0.1.0</version>
</dependency>
+ <!-- servlet -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
</dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
- <scope>test</scope>
</dependency>
<!--<dependency>
<groupId>de.ids_mannheim.korap</groupId>
@@ -644,6 +663,7 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>-->
+
<!-- LDAP -->
<dependency>
<groupId>com.novell.ldap</groupId>
@@ -656,34 +676,6 @@
<version>6.0.9</version>
</dependency>
- <!-- Hibernate -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jpamodelgen</artifactId>
- <version>${hibernate.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-java8</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
<!-- MySql -->
<dependency>
@@ -771,7 +763,6 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.28</version>
- <scope>provided</scope>
</dependency>
<!-- Mockserver -->
@@ -781,13 +772,5 @@
<version>5.15.0</version>
<scope>test</scope>
</dependency>
-
- <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>1.10.0</version>
- </dependency>
-
</dependencies>
</project>
diff --git a/full/src/test/resources/test-jdbc.properties b/full/src/test/resources/test-jdbc.properties
index 02e77b2..7fc4b7c 100644
--- a/full/src/test/resources/test-jdbc.properties
+++ b/full/src/test/resources/test-jdbc.properties
@@ -4,9 +4,9 @@
jdbc.database=sqlite
jdbc.driverClassName=org.sqlite.JDBC
#jdbc.url=jdbc:sqlite::memory:
-jdbc.url=jdbc:sqlite:file::memory:?cache=shared
+#jdbc.url=jdbc:sqlite:file::memory:?cache=shared
#jdbc.url=jdbc:sqlite::memory:?cache=shared
-#jdbc.url=jdbc:sqlite:testDB.sqlite
+jdbc.url=jdbc:sqlite:testDB.sqlite
jdbc.username=pc
jdbc.password=pc
jdbc.schemaPath=classpath:db/sqlite,db/predefined,db/test
\ No newline at end of file