From 95c7aab4d27299c723fd4e20d3616ceafb9fb540 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Thu, 20 Sep 2018 20:40:52 +0200
Subject: [PATCH] Minor dependency issues
---
P/Sda1/InsertGui/V10/pom.xml | 2 +-
P/Sda1/InsertGui/V12/pom.xml | 2 +-
P/Sda1/InsertGui/V2/pom.xml | 2 +-
P/Sda1/InsertGui/V4/pom.xml | 2 +-
P/Sda1/InsertGui/V6/pom.xml | 2 +-
P/Sda1/InsertGui/V8/pom.xml | 2 +-
P/Sda1/Jpa/Company/companyJpa1/pom.xml | 2 +-
P/Sda1/Vaadin/IntegerSet/pom.xml | 2 +-
P/Sda1/Vaadin/IntegerSetSkeleton/pom.xml | 2 +-
P/Sda1/Vaadin/Sudoku/pom.xml | 2 +-
P/Sda2/Jpa/University/pom.xml | 13 +++++++++++++
.../mi/sda2/jpa/university/Driver.java | 6 +++---
P/Sda2/Register/pom.xml | 2 +-
P/Sda2/forum_1/pom.xml | 2 +-
14 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/P/Sda1/InsertGui/V10/pom.xml b/P/Sda1/InsertGui/V10/pom.xml
index 6a63185cb..d09cc7386 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 6e5de11de..f155b713d 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 a74d653a6..708f7eccb 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 ed496b4cd..94cf76109 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 a3e61ea1c..7fd3b08bb 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 2e6bea14b..f6caec2b5 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 0aaf3575c..e0aaef830 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 57ef37bd5..2a96089a4 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 e7651cfdf..ef3733157 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 ecdfe0f60..71c20c585 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 653cdbf87..7ed2e9c58 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 4c6a17222..29e132869 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 1bfda956d..41ce4d34d 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 777e1b283..6d24b9df3 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>
--
GitLab