From 345e2fc740dc52910d7888ade177f7b44d22603f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Henke?= <joerg.henke@uni-greifswald.de>
Date: Sat, 27 Feb 2021 17:32:47 +0100
Subject: [PATCH] add folders to gradle wrapper search path

---
 .classpath                                    | 28 +++++++++++--------
 .settings/org.eclipse.jdt.core.prefs          |  6 ++--
 .settings/org.eclipse.wst.common.component    |  5 +++-
 ....eclipse.wst.common.project.facet.core.xml |  2 +-
 build.gradle                                  |  9 ++++--
 5 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/.classpath b/.classpath
index c52a066..fdc2fdc 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="bin/main" path="src/main/java">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src/jooq/java"/>
 	<classpathentry kind="src" output="bin/main" path="src/main/resources">
 		<attributes>
 			<attribute name="gradle_scope" value="main"/>
@@ -15,22 +8,35 @@
 	</classpathentry>
 	<classpathentry kind="src" output="bin/test" path="src/test/java">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="gradle_scope" value="test"/>
 			<attribute name="gradle_used_by_scope" value="test"/>
+			<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 kind="src" output="bin/main" path="src/main/java">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="src/jooq/java">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="src/main/webapp">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/webapp"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 3a21537..049e42f 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index a7bd228..766a51d 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -6,10 +6,13 @@
         		
         <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
         		
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/webapp"/>
+        		
         <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
         		
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="src/jooq/java"/>
+        		
         <wb-resource deploy-path="/" source-path="src/main/webapp"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/jooq/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp"/>
         	
     </wb-module>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index cea524a..14e5ac1 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
 	<fixed facet="jst.java"/>
 	<fixed facet="jst.web"/>
 	<installed facet="jst.web" version="2.4"/>
-	<installed facet="jst.java" version="1.8"/>
+	<installed facet="jst.java" version="11"/>
 </faceted-project>
diff --git a/build.gradle b/build.gradle
index 1ddd4d7..3682f63 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,8 +29,13 @@ version = '1.1.4'
 
 description = """timetrack"""
 
-sourceCompatibility = 8
-targetCompatibility = 8
+sourceCompatibility = 11
+targetCompatibility = 11
+
+sourceSets {
+  main.java.srcDirs = ['src/main/java', 'src/jooq/java']
+  main.resources.srcDirs = ['src/main/resources', 'src/main/webapp']
+}
 
 tasks.withType(JavaCompile) {
      options.encoding = 'UTF-8'