diff --git a/P/Sda1/InsertGui/V10/pom.xml b/P/Sda1/InsertGui/V10/pom.xml
index 6a63185cb6d48405a401abb3be76706352bea41e..d09cc7386600a9a5ab5963fcbba13be16068cfe8 100644
--- a/P/Sda1/InsertGui/V10/pom.xml
+++ b/P/Sda1/InsertGui/V10/pom.xml
@@ -17,7 +17,7 @@
 	<name>addressinsert</name>
 
 	<properties>
-		<vaadin.version>7.6.1</vaadin.version>
+		<vaadin.version>8.5.2</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 		<jetty.plugin.version>9.3.5.v20151012</jetty.plugin.version>
 	</properties>
diff --git a/P/Sda1/InsertGui/V12/pom.xml b/P/Sda1/InsertGui/V12/pom.xml
index 6e5de11deaf5599780a699523e42b79d521052f3..f155b713dd4f6ad941ed74bfab939f4ff9e4fdc0 100644
--- a/P/Sda1/InsertGui/V12/pom.xml
+++ b/P/Sda1/InsertGui/V12/pom.xml
@@ -17,7 +17,7 @@
 	<name>addressinsert</name>
 
 	<properties>
-		<vaadin.version>7.6.1</vaadin.version>
+		<vaadin.version>8.5.2</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 		<jetty.plugin.version>9.3.5.v20151012</jetty.plugin.version>
 	</properties>
diff --git a/P/Sda1/InsertGui/V2/pom.xml b/P/Sda1/InsertGui/V2/pom.xml
index a74d653a64d6612a10c63ddbe42919c10a1e40e0..708f7eccb6bfae555c0a4c5d44263aeecb4f2aed 100644
--- a/P/Sda1/InsertGui/V2/pom.xml
+++ b/P/Sda1/InsertGui/V2/pom.xml
@@ -17,7 +17,7 @@
 	<name>addressinsert</name>
 
 	<properties>
-		<vaadin.version>7.6.1</vaadin.version>
+		<vaadin.version>8.5.2</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 		<jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
 		<project.source.version>1.8</project.source.version>
diff --git a/P/Sda1/InsertGui/V4/pom.xml b/P/Sda1/InsertGui/V4/pom.xml
index ed496b4cd9deb97336e9b29c1e188e8a829883d8..94cf76109ba7aeb46c01542571aa97f5a657c034 100644
--- a/P/Sda1/InsertGui/V4/pom.xml
+++ b/P/Sda1/InsertGui/V4/pom.xml
@@ -17,7 +17,7 @@
 	<name>addressinsert</name>
 
 	<properties>
-		<vaadin.version>7.6.1</vaadin.version>
+		<vaadin.version>8.5.2</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 		<jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
 		<project.source.version>1.8</project.source.version>
diff --git a/P/Sda1/InsertGui/V6/pom.xml b/P/Sda1/InsertGui/V6/pom.xml
index a3e61ea1cbf63ac093756e778cd2149a6bd50178..7fd3b08bb40a28e1fb1d2839b526f285218e6d68 100644
--- a/P/Sda1/InsertGui/V6/pom.xml
+++ b/P/Sda1/InsertGui/V6/pom.xml
@@ -17,7 +17,7 @@
 	<name>addressinsert</name>
 
 	<properties>
-		<vaadin.version>7.6.1</vaadin.version>
+		<vaadin.version>8.5.2</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 		<jetty.plugin.version>9.3.5.v20151012</jetty.plugin.version>
 	</properties>
diff --git a/P/Sda1/InsertGui/V8/pom.xml b/P/Sda1/InsertGui/V8/pom.xml
index 2e6bea14b50c944bdf5ea23f080c4828f9c7fb7a..f6caec2b5b7d45ba88ca254545460052660294f0 100644
--- a/P/Sda1/InsertGui/V8/pom.xml
+++ b/P/Sda1/InsertGui/V8/pom.xml
@@ -17,7 +17,7 @@
 	<name>addressinsert</name>
 
 	<properties>
-		<vaadin.version>7.6.1</vaadin.version>
+		<vaadin.version>8.5.2</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 		<jetty.plugin.version>9.3.5.v20151012</jetty.plugin.version>
 	</properties>
diff --git a/P/Sda1/Jpa/Company/companyJpa1/pom.xml b/P/Sda1/Jpa/Company/companyJpa1/pom.xml
index 0aaf3575c43de25820bd49dfe608730aa0188cd5..e0aaef830edf9ef15d32ea100403f763c5dddffd 100644
--- a/P/Sda1/Jpa/Company/companyJpa1/pom.xml
+++ b/P/Sda1/Jpa/Company/companyJpa1/pom.xml
@@ -18,7 +18,7 @@
 	<url>http://www.mi.hdm-stuttgart.de/freedocs</url>
 
 	<properties>
-		<vaadin.version>7.6.1</vaadin.version>
+		<vaadin.version>8.5.2</vaadin.version>
 		<vaadin.jpacontainer.version>3.2.0</vaadin.jpacontainer.version>
 	</properties>
 
diff --git a/P/Sda1/Vaadin/IntegerSet/pom.xml b/P/Sda1/Vaadin/IntegerSet/pom.xml
index 57ef37bd5e37934616417f6ddeab3648dc27f979..2a96089a467a07599718f48ef1928debc6c15db3 100644
--- a/P/Sda1/Vaadin/IntegerSet/pom.xml
+++ b/P/Sda1/Vaadin/IntegerSet/pom.xml
@@ -19,7 +19,7 @@
 	<url>http://www.mi.hdm-stuttgart.de/freedocs</url>
 
 	<properties>
-		<vaadin.version>7.6.1</vaadin.version>
+		<vaadin.version>8.5.2</vaadin.version>
 	</properties>
 
 	<build>
diff --git a/P/Sda1/Vaadin/IntegerSetSkeleton/pom.xml b/P/Sda1/Vaadin/IntegerSetSkeleton/pom.xml
index e7651cfdf3e8bf932ac3f7f642132401b4e6accd..ef37331572b0533290ffece345d44c7b699047b7 100644
--- a/P/Sda1/Vaadin/IntegerSetSkeleton/pom.xml
+++ b/P/Sda1/Vaadin/IntegerSetSkeleton/pom.xml
@@ -19,7 +19,7 @@
 	<url>http://www.mi.hdm-stuttgart.de/freedocs</url>
 
 	<properties>
-		<vaadin.version>7.6.1</vaadin.version>
+		<vaadin.version>8.5.2</vaadin.version>
 	</properties>
 
 	<build>
diff --git a/P/Sda1/Vaadin/Sudoku/pom.xml b/P/Sda1/Vaadin/Sudoku/pom.xml
index ecdfe0f602550f765a5f3d4f4867a21f7f2cf43d..71c20c585dbfde2d05a6130ec042d261b06f9d1e 100644
--- a/P/Sda1/Vaadin/Sudoku/pom.xml
+++ b/P/Sda1/Vaadin/Sudoku/pom.xml
@@ -19,7 +19,7 @@
 	<name>sudoku</name>
 
 	<properties>
-		<vaadin.version>7.6.1</vaadin.version>
+		<vaadin.version>8.5.2</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 		<jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
 		<project.source.version>1.8</project.source.version>
diff --git a/P/Sda2/Jpa/University/pom.xml b/P/Sda2/Jpa/University/pom.xml
index 653cdbf879720632cf2772e1b9a4a1448c414ac7..7ed2e9c58a61de59a90ba0294cc1c55a5cc7ee36 100644
--- a/P/Sda2/Jpa/University/pom.xml
+++ b/P/Sda2/Jpa/University/pom.xml
@@ -30,6 +30,19 @@
       <version>2.5.0</version>
     </dependency>
 
+    <dependency>
+      <groupId>javax.xml</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.1</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+
+
   </dependencies>
 
   <build>
diff --git a/P/Sda2/Jpa/University/src/main/java/de/hdm_stuttgart/mi/sda2/jpa/university/Driver.java b/P/Sda2/Jpa/University/src/main/java/de/hdm_stuttgart/mi/sda2/jpa/university/Driver.java
index 4c6a17222f4efad5d8c09fd2ed816626d97e0eeb..29e1328691b7b3924f97d71cb0e976b92aa1d477 100644
--- a/P/Sda2/Jpa/University/src/main/java/de/hdm_stuttgart/mi/sda2/jpa/university/Driver.java
+++ b/P/Sda2/Jpa/University/src/main/java/de/hdm_stuttgart/mi/sda2/jpa/university/Driver.java
@@ -23,9 +23,9 @@ public class Driver {
    private static Logger log = LogManager.getLogger(Driver.class);
 
    /**
-    * @param args
-    *           Unused
-    * @throws JAXBException
+    * @param args Unused
+    *
+    * @throws JAXBException Parsing configuration may fail
     */
    public static void main(String[] args) throws JAXBException {
 
diff --git a/P/Sda2/Register/pom.xml b/P/Sda2/Register/pom.xml
index 1bfda956d0c49b6553b4d70b166766a472e2db35..41ce4d34d6d24d0dda062f7c9cc79c574c48b4d8 100644
--- a/P/Sda2/Register/pom.xml
+++ b/P/Sda2/Register/pom.xml
@@ -19,7 +19,7 @@
   <name>Vaadin Web Application</name>
 
   <properties>
-    <vaadin.version>7.6.1</vaadin.version>
+    <vaadin.version>8.5.2</vaadin.version>
     <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
   </properties>
 
diff --git a/P/Sda2/forum_1/pom.xml b/P/Sda2/forum_1/pom.xml
index 777e1b283dcdef580347f795fced919bb42e5fd3..6d24b9df371b27ae347e5864490d3666fac00b09 100644
--- a/P/Sda2/forum_1/pom.xml
+++ b/P/Sda2/forum_1/pom.xml
@@ -18,7 +18,7 @@
   <name>Forum application</name>
 
   <properties>
-    <vaadin.version>7.6.1</vaadin.version>
+    <vaadin.version>8.5.2</vaadin.version>
     <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
     <eclipse.link.version>2.5.2</eclipse.link.version>
   </properties>