From 7cec6e7824d0ed95db82943af4e3154496327b83 Mon Sep 17 00:00:00 2001
From: Markus Kreth <markus.kreth@web.de>
Date: Thu, 1 Nov 2018 13:20:35 +0100
Subject: [PATCH] Spring and Vaadin updates

---
 .classpath                                    | 10 ++++-----
 .settings/org.eclipse.wst.common.component    | 12 +++++++++-
 ....eclipse.wst.common.project.facet.core.xml |  2 +-
 pom.xml                                       | 22 ++++++++++++-------
 src/main/resources/application.properties     |  4 ++--
 .../themes/vaadin-clubhelpertheme/styles.css  |  8 ++++++-
 6 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/.classpath b/.classpath
index b2e2b14..2323c6f 100644
--- a/.classpath
+++ b/.classpath
@@ -24,20 +24,18 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="target/generated-resources/gwt">
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="target/generated-resources/gwt">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index d3d71d1..749a096 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+        
     <wb-module deploy-name="vaadin-clubhelper-0.0.1-SNAPSHOT">
+                
         <wb-resource deploy-path="/" source-path="/WebContent"/>
+                
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+                
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-resources/gwt"/>
+                
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+                
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-resources/gwt"/>
+                
         <property name="context-root" value="vaadin-clubhelper"/>
+                
         <property name="java-output-path" value="/vaadin-clubhelper/target/classes"/>
+            
     </wb-module>
+    
 </project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 170b658..2d1f631 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,6 +3,6 @@
   <fixed facet="wst.jsdt.web"/>
   <installed facet="jpt.jpa" version="2.1"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="jst.web" version="3.1"/>
   <installed facet="java" version="1.8"/>
+  <installed facet="jst.web" version="4.0"/>
 </faceted-project>
diff --git a/pom.xml b/pom.xml
index 4ca3459..c2b291d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.6.RELEASE</version>
+		<version>2.1.0.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -25,7 +25,7 @@
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-		<vaadin.version>8.4.4</vaadin.version>
+		<vaadin.version>8.5.2</vaadin.version>
 		<google-api-version>1.23.0</google-api-version>
 		<google-api-sheets-version>v4-rev488-1.23.0</google-api-sheets-version>
 		<google-api-calendar-version>v3-rev271-1.23.0</google-api-calendar-version>
@@ -186,7 +186,13 @@
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
 			<version>2.4.0-b180830.0438</version>
+		</dependency><!-- https://mvnrepository.com/artifact/org.javassist/javassist -->
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.23.1-GA</version>
 		</dependency>
+
 	</dependencies>
 
 	<dependencyManagement>
@@ -243,12 +249,12 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.22.1</version>
-<!-- 				<configuration> -->
-<!-- 					<argLine> -->
-<!-- 						-javaagent:${sonar.jacoco.jar}=destfile=${sonar.jacoco.reportPath} -->
-<!-- 					</argLine> -->
-					<!-- <test>**/*.java</test> -->
-<!-- 				</configuration> -->
+				<!-- <configuration> -->
+				<!-- <argLine> -->
+				<!-- -javaagent:${sonar.jacoco.jar}=destfile=${sonar.jacoco.reportPath} -->
+				<!-- </argLine> -->
+				<!-- <test>**/*.java</test> -->
+				<!-- </configuration> -->
 
 				<dependencies>
 					<dependency>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e6c9168..021d252 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,8 +2,8 @@ spring.datasource.url=jdbc:mysql://localhost:3306/clubhelper?useUnicode=yes&char
 spring.datasource.username=markus
 spring.datasource.password=0773
 security.ignored=/**
-security.basic.enable: false   
-management.security.enabled: false
+security.basic.enable=false   
+management.security.enabled=false
 
 spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
\ No newline at end of file
diff --git a/src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css b/src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css
index a3de4cc..f78b290 100644
--- a/src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css
+++ b/src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css
@@ -1091,7 +1091,7 @@
  */
 
 .v-vaadin-version:after {
-	content: "8.4.4";
+	content: "8.5.2";
 }
 
 .v-widget {
@@ -5078,6 +5078,8 @@ div.v-layout.v-horizontal.v-widget {
 	-webkit-box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
 	box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
 	border-right: 1px solid #d4d4d4;
+	position: relative;
+	z-index: 11;
 }
 
 .vaadin-clubhelpertheme .v-grid-cell.frozen  + th, .vaadin-clubhelpertheme .v-grid-cell.frozen  + td {
@@ -9724,6 +9726,8 @@ div.v-layout.v-horizontal.v-widget {
 	-webkit-box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
 	box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
 	border-right: 1px solid #d4d4d4;
+	position: relative;
+	z-index: 11;
 }
 
 .vaadin-clubhelpertheme .v-tree8-cell.frozen  + th, .vaadin-clubhelpertheme .v-tree8-cell.frozen  + td {
@@ -10800,6 +10804,8 @@ div.v-layout.v-horizontal.v-widget {
 	-webkit-box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
 	box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
 	border-right: 1px solid #d4d4d4;
+	position: relative;
+	z-index: 11;
 }
 
 .vaadin-clubhelpertheme .v-treegrid-cell.frozen  + th, .vaadin-clubhelpertheme .v-treegrid-cell.frozen  + td {