Fixed javassist problem.
Change-Id: I7c4bb80ccfc025902f8a732a67822823cf045483
diff --git a/core/pom.xml b/core/pom.xml
index 4c5d03c..7ab9f21 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,13 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Kustvakt-core</artifactId>
- <version>0.59.9</version>
+ <version>0.59.10</version>
<properties>
<java.version>1.7</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-framework.version>4.3.11.RELEASE</spring-framework.version>
<jersey.version>1.19.4</jersey.version>
+ <hibernate.version>5.1.11.Final</hibernate.version>
</properties>
<build>
<resources>
@@ -269,11 +270,8 @@
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
- <version>0.9.9-RC1</version>
+ <version>0.9.10</version>
</dependency>
-
-
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -427,7 +425,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
- <version>5.1.8.Final</version>
+ <version>${hibernate.version}</version>
</dependency>
</dependencies>
diff --git a/full/pom.xml b/full/pom.xml
index 23aaa71..9b18889 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -3,12 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Kustvakt-full</artifactId>
- <version>0.59.9</version>
+ <version>0.59.10</version>
<properties>
<java.version>1.7</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-framework.version>4.3.11.RELEASE</spring-framework.version>
<jersey.version>1.19.4</jersey.version>
+ <hibernate.version>5.1.11.Final</hibernate.version>
</properties>
<build>
<resources>
@@ -76,10 +77,10 @@
<processor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</processor>
<processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
</compilerArguments> -->
- <!-- <processors>
+ <processors>
<processor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</processor>
<processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
- </processors> -->
+ </processors>
</configuration>
</plugin>
<plugin>
@@ -186,14 +187,25 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>5.1.8.Final</version>
+ <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>5.2.12.Final</version>
+ <version>${hibernate.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.22.0-GA</version>
+ </dependency>
<!-- MySql -->
<dependency>