From 82cd628ef101744c7aee8c6569da4c07676714db Mon Sep 17 00:00:00 2001
From: "Appleton, Joseph Dr (Comp Sci & Elec Eng)" <j.appleton@surrey.ac.uk>
Date: Thu, 6 Mar 2025 09:18:36 +0000
Subject: [PATCH] re-organised solutions
---
.../.settings/org.eclipse.jdt.apt.core.prefs | 2 ++
.../.settings/org.eclipse.jdt.core.prefs | 7 ++++---
exercise-1-solutions/pom.xml | 9 ++++-----
.../src/main/resources/database.db | Bin 12288 -> 12288 bytes
exercise-2-1-solution/pom.xml | 5 ++---
exercise-2-2-solution/pom.xml | 5 +++--
exercise-2-3-solution/pom.xml | 6 ++++--
exercise-2-4-solution/pom.xml | 4 ++--
exercise-2-5-solution/pom.xml | 12 ++++++------
9 files changed, 27 insertions(+), 23 deletions(-)
create mode 100644 exercise-1-solutions/.settings/org.eclipse.jdt.apt.core.prefs
diff --git a/exercise-1-solutions/.settings/org.eclipse.jdt.apt.core.prefs b/exercise-1-solutions/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000..d4313d4
--- /dev/null
+++ b/exercise-1-solutions/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/exercise-1-solutions/.settings/org.eclipse.jdt.core.prefs b/exercise-1-solutions/.settings/org.eclipse.jdt.core.prefs
index 5723a0f..1b6e1ef 100644
--- a/exercise-1-solutions/.settings/org.eclipse.jdt.core.prefs
+++ b/exercise-1-solutions/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,9 @@
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/exercise-1-solutions/pom.xml b/exercise-1-solutions/pom.xml
index b1d2d09..3847ba9 100644
--- a/exercise-1-solutions/pom.xml
+++ b/exercise-1-solutions/pom.xml
@@ -6,21 +6,20 @@
<artifactId>yatl</artifactId>
<version>0.0.1-SNAPSHOT</version>
<dependencies>
-
- <!-- https://mvnrepository.com/artifact/io.javalin/javalin -->
+ <!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
<dependency>
<groupId>io.javalin</groupId>
<artifactId>javalin</artifactId>
- <version>6.1.2</version>
+ <version>6.4.0</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.45.1.0</version>
+ <version>3.49.1.0</version>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/exercise-1-solutions/src/main/resources/database.db b/exercise-1-solutions/src/main/resources/database.db
index 43cc5599692a38893c0473caf05f629864963394..b98090d103b06b3b01ee9953e0d0ed0d07e50f49 100644
GIT binary patch
delta 106
zcmZojXh@hKEvU-Cz`zW|Fu*%e#~3K6*QUt}6k_7nWZ>82uih*uu#<1HCjVWojST!B
z`0w$b=idkvTgWdb!@|N~%juY$st}x?R#Ki=l&avGm!6rInp%{Zm%jPDyrBR9VrUvO
delta 91
zcmZojXh@hKEhx{xz`zW|Fu*-g#~3K6SJuf36k_7nWZ>82uih*uu#<1HCjVWo0}T8h
l`0w$b=RdGnP+<c<KQ9XlgFL5GX{AC=X<l;1=JWD~0ss~h6yX2>
diff --git a/exercise-2-1-solution/pom.xml b/exercise-2-1-solution/pom.xml
index b1d2d09..44e10c8 100644
--- a/exercise-2-1-solution/pom.xml
+++ b/exercise-2-1-solution/pom.xml
@@ -11,16 +11,15 @@
<dependency>
<groupId>io.javalin</groupId>
<artifactId>javalin</artifactId>
- <version>6.1.2</version>
+ <version>6.4.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.45.1.0</version>
+ <version>3.49.1.0</version>
</dependency>
-
</dependencies>
</project>
\ No newline at end of file
diff --git a/exercise-2-2-solution/pom.xml b/exercise-2-2-solution/pom.xml
index c0858e5..63041b7 100644
--- a/exercise-2-2-solution/pom.xml
+++ b/exercise-2-2-solution/pom.xml
@@ -12,16 +12,17 @@
<dependency>
<groupId>io.javalin</groupId>
<artifactId>javalin</artifactId>
- <version>6.1.2</version>
+ <version>6.4.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.45.1.0</version>
+ <version>3.49.1.0</version>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/exercise-2-3-solution/pom.xml b/exercise-2-3-solution/pom.xml
index c0858e5..a670e93 100644
--- a/exercise-2-3-solution/pom.xml
+++ b/exercise-2-3-solution/pom.xml
@@ -12,16 +12,18 @@
<dependency>
<groupId>io.javalin</groupId>
<artifactId>javalin</artifactId>
- <version>6.1.2</version>
+ <version>6.4.0</version>
</dependency>
+
<!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.45.1.0</version>
+ <version>3.49.1.0</version>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/exercise-2-4-solution/pom.xml b/exercise-2-4-solution/pom.xml
index c0858e5..57779bc 100644
--- a/exercise-2-4-solution/pom.xml
+++ b/exercise-2-4-solution/pom.xml
@@ -14,14 +14,14 @@
<artifactId>javalin</artifactId>
<version>6.1.2</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.45.1.0</version>
+ <version>3.49.1.0</version>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/exercise-2-5-solution/pom.xml b/exercise-2-5-solution/pom.xml
index f3abf8a..ab30968 100644
--- a/exercise-2-5-solution/pom.xml
+++ b/exercise-2-5-solution/pom.xml
@@ -19,14 +19,14 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.45.1.0</version>
+ <version>3.49.1.0</version>
</dependency>
-
-
+
+
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.16.1</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.16.1</version>
</dependency>
--
GitLab