From 3622595f65c2e7de5f476f38fe380ae635428e94 Mon Sep 17 00:00:00 2001
From: MohammadAbbas12 <114485365+MohammadAbbas12@users.noreply.github.com>
Date: Fri, 5 Jan 2024 23:34:10 +0530
Subject: [PATCH 1/7] Update pom.xml

---
 web/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/pom.xml b/web/pom.xml
index b4620fdaf..181954f9d 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -19,4 +19,8 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+    <properties>
+             <maven.compiler.source>7</maven.compiler.source>
+             <maven.compiler.target>1.7</maven.compiler.target>
+    </properties>        
 </project>

From ac4b78aa0c94edeb38ef39ca517e09c7ffac58ad Mon Sep 17 00:00:00 2001
From: MohammadAbbas12 <114485365+MohammadAbbas12@users.noreply.github.com>
Date: Sat, 6 Jan 2024 10:17:58 +0530
Subject: [PATCH 2/7] Update Tracker.java

---
 .../main/java/training/taylor/timetracker/core/Tracker.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/training/taylor/timetracker/core/Tracker.java b/core/src/main/java/training/taylor/timetracker/core/Tracker.java
index 74ee98ce3..1f2664a90 100644
--- a/core/src/main/java/training/taylor/timetracker/core/Tracker.java
+++ b/core/src/main/java/training/taylor/timetracker/core/Tracker.java
@@ -1,8 +1,8 @@
 package training.taylor.timetracker.core;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import training.taylor.timetracker.core.dao.TimeEntry;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//import training.taylor.timetracker.core.dao.TimeEntry;
 
 import java.util.List;
 

From 520372b28df640c690c7b131c5571bca22403805 Mon Sep 17 00:00:00 2001
From: MohammadAbbas12 <114485365+MohammadAbbas12@users.noreply.github.com>
Date: Sat, 6 Jan 2024 10:23:12 +0530
Subject: [PATCH 3/7] Update Tracker.java

---
 .../main/java/training/taylor/timetracker/core/Tracker.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/training/taylor/timetracker/core/Tracker.java b/core/src/main/java/training/taylor/timetracker/core/Tracker.java
index 1f2664a90..74ee98ce3 100644
--- a/core/src/main/java/training/taylor/timetracker/core/Tracker.java
+++ b/core/src/main/java/training/taylor/timetracker/core/Tracker.java
@@ -1,8 +1,8 @@
 package training.taylor.timetracker.core;
 
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//import training.taylor.timetracker.core.dao.TimeEntry;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import training.taylor.timetracker.core.dao.TimeEntry;
 
 import java.util.List;
 

From 549077770eaa8ec84972ed52dfecf897396dd5de Mon Sep 17 00:00:00 2001
From: MohammadAbbas12 <114485365+MohammadAbbas12@users.noreply.github.com>
Date: Sat, 6 Jan 2024 10:25:12 +0530
Subject: [PATCH 4/7] Causing problems by commenting out code

---
 .../main/java/training/taylor/timetracker/core/Tracker.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/training/taylor/timetracker/core/Tracker.java b/core/src/main/java/training/taylor/timetracker/core/Tracker.java
index 74ee98ce3..1f2664a90 100644
--- a/core/src/main/java/training/taylor/timetracker/core/Tracker.java
+++ b/core/src/main/java/training/taylor/timetracker/core/Tracker.java
@@ -1,8 +1,8 @@
 package training.taylor.timetracker.core;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import training.taylor.timetracker.core.dao.TimeEntry;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//import training.taylor.timetracker.core.dao.TimeEntry;
 
 import java.util.List;
 

From bbf01cd4aac2fca3cb04dacc8a4866c44edd1695 Mon Sep 17 00:00:00 2001
From: Abbas <shaikabbas78666@gmail.com>
Date: Sat, 6 Jan 2024 04:59:32 +0000
Subject: [PATCH 5/7] Undoing committing changes to fix build

---
 .../main/java/training/taylor/timetracker/core/Tracker.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/training/taylor/timetracker/core/Tracker.java b/core/src/main/java/training/taylor/timetracker/core/Tracker.java
index 1f2664a90..74ee98ce3 100644
--- a/core/src/main/java/training/taylor/timetracker/core/Tracker.java
+++ b/core/src/main/java/training/taylor/timetracker/core/Tracker.java
@@ -1,8 +1,8 @@
 package training.taylor.timetracker.core;
 
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//import training.taylor.timetracker.core.dao.TimeEntry;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import training.taylor.timetracker.core.dao.TimeEntry;
 
 import java.util.List;
 

From a7f816dca814a2ba946a7a44b0d5dc61c77ead87 Mon Sep 17 00:00:00 2001
From: Abbas <shaikabbas78666@gmail.com>
Date: Sat, 6 Jan 2024 05:03:03 +0000
Subject: [PATCH 6/7] Causing problems by commenting out code

---
 .../main/java/training/taylor/timetracker/core/Tracker.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/training/taylor/timetracker/core/Tracker.java b/core/src/main/java/training/taylor/timetracker/core/Tracker.java
index 74ee98ce3..1f2664a90 100644
--- a/core/src/main/java/training/taylor/timetracker/core/Tracker.java
+++ b/core/src/main/java/training/taylor/timetracker/core/Tracker.java
@@ -1,8 +1,8 @@
 package training.taylor.timetracker.core;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import training.taylor.timetracker.core.dao.TimeEntry;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//import training.taylor.timetracker.core.dao.TimeEntry;
 
 import java.util.List;
 

From 25d7e5c8afc1b58d3b974784de74012680589433 Mon Sep 17 00:00:00 2001
From: MohammadAbbas12 <114485365+MohammadAbbas12@users.noreply.github.com>
Date: Sun, 7 Jan 2024 13:24:17 +0530
Subject: [PATCH 7/7] Update pom.xml

update
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d7690fbd4..b25b04c55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <spring.version>5.0.2.RELEASE</spring.version>
-        <java.version>1.8</java.version>
+        <java.version>1.11</java.version>
         <junit.version>4.12</junit.version>
         <findbugs.version>3.0.5</findbugs.version>
         <pmd.version>3.8</pmd.version>
@@ -33,7 +33,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.6.1</version>
+                    <version>3.9.6</version>
                     <configuration>
                         <verbose>true</verbose>
                         <fork>true</fork>