From 95946ab98f24769ae53a1f8096e10102e4cf3c52 Mon Sep 17 00:00:00 2001
From: "Dr. Martin Goik" <goik@hdm-stuttgart.de>
Date: Fri, 22 Jun 2018 13:23:26 +0200
Subject: [PATCH] Streamlining, version upgrade, annotat. processor
---
Klausuren/Sda1/2016Winter/Exam/pom.xml | 8 ++++++-
Klausuren/Sda1/2016Winter/Solution/pom.xml | 25 ++++++++++++++--------
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/Klausuren/Sda1/2016Winter/Exam/pom.xml b/Klausuren/Sda1/2016Winter/Exam/pom.xml
index a7f9ec72b..62bf148a5 100644
--- a/Klausuren/Sda1/2016Winter/Exam/pom.xml
+++ b/Klausuren/Sda1/2016Winter/Exam/pom.xml
@@ -13,7 +13,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <hibernate.version>5.2.12.Final</hibernate.version>
+ <hibernate.version>5.3.1.Final</hibernate.version>
<querydsl.version>3.7.4</querydsl.version>
</properties>
@@ -84,6 +84,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+
<dependency>
<groupId>de.hdm_stuttgart.mi.exam</groupId>
<artifactId>unitmarking</artifactId>
diff --git a/Klausuren/Sda1/2016Winter/Solution/pom.xml b/Klausuren/Sda1/2016Winter/Solution/pom.xml
index 92a0fcd48..63a2e1388 100644
--- a/Klausuren/Sda1/2016Winter/Solution/pom.xml
+++ b/Klausuren/Sda1/2016Winter/Solution/pom.xml
@@ -13,6 +13,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <hibernate.version>5.3.1.Final</hibernate.version>
+ <querydsl.version>3.7.4</querydsl.version>
</properties>
<repositories>
@@ -72,7 +74,20 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>5.2.5.Final</version>
+ <version>${hibernate.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jpamodelgen</artifactId>
+ <version>${hibernate.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
</dependency>
<dependency>
@@ -116,13 +131,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jpamodelgen</artifactId>
- <version>5.2.5.Final</version>
- </dependency>
- </dependencies>
</plugin>
<!-- Build helper plugin to add generated sources to classpath -->
@@ -146,7 +154,6 @@
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
--
GitLab