From 6af1558b995b2f860d1181c125a9970c3e7fbcd7 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Tue, 4 Apr 2023 02:37:40 +0200
Subject: [PATCH] Clean up; use the most recent version of labyrinth generator.

---
 pom.xml                                       | 59 +++++++++++++++++--
 .../server/handler/CreateHandler.java         | 10 +++-
 2 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index bf06567..39521da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,20 +12,41 @@
     <groupId>ch.fritteli.labyrinth</groupId>
     <artifactId>labyrinth-server</artifactId>
     <version>0.0.2-SNAPSHOT</version>
+    <description>The Labyrinth server, offering a ReST endpoint to access the Labyrinth Generator.</description>
+    <url>https://manuel.friedli.info/labyrinth.html</url>
 
     <properties>
-        <logback.version>1.4.6</logback.version>
-        <lombok.version>1.18.26</lombok.version>
-        <slf4j.version>2.0.5</slf4j.version>
         <java.source.version>17</java.source.version>
         <java.target.version>17</java.target.version>
+        <jetbrains-annotations.version>24.0.1</jetbrains-annotations.version>
+        <junit-jupiter.version>5.9.2</junit-jupiter.version>
+        <logback.version>1.4.6</logback.version>
+        <lombok.version>1.18.26</lombok.version>
+        <slf4j.version>2.0.7</slf4j.version>
+        <vavr.version>0.10.4</vavr.version>
     </properties>
 
+    <developers>
+        <developer>
+            <name>Manuel Friedli</name>
+            <id>manuel</id>
+            <url>https://www.fritteli.ch/</url>
+            <email>manuel@fritteli.ch</email>
+            <timezone>Europe/Zurich</timezone>
+            <roles>
+                <role>Project Lead</role>
+                <role>Software Architect</role>
+                <role>Software Engineer</role>
+                <role>Operations Manager</role>
+            </roles>
+        </developer>
+    </developers>
+
     <dependencies>
         <dependency>
             <groupId>ch.fritteli.labyrinth</groupId>
             <artifactId>labyrinth-generator</artifactId>
-            <version>0.0.2</version>
+            <version>0.0.3</version>
         </dependency>
         <dependency>
             <groupId>io.vavr</groupId>
@@ -65,7 +86,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.4.1</version>
                 <configuration>
                     <transformers>
                         <transformer
@@ -73,6 +94,14 @@
                             <mainClass>ch.fritteli.labyrinth.server.Main</mainClass>
                         </transformer>
                     </transformers>
+                    <filters>
+                        <filter>
+                            <artifact>ch.fritteli.labyrinth:labyrinth-generator</artifact>
+                            <excludes>
+                                <exclude>logback.xml</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
                 </configuration>
                 <executions>
                     <execution>
@@ -83,10 +112,28 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>4.0.0-M6</version>
+            </plugin>
         </plugins>
     </build>
     <scm>
-        <connection>scm:git:git://gittr.ch/java/labyrinth-server.git</connection>
+        <connection>scm:git:https://gittr.ch/java/labyrinth-server.git</connection>
         <developerConnection>scm:git:ssh://git@gittr.ch/java/labyrinth-server.git</developerConnection>
         <url>https://gittr.ch/java/labyrinth-server</url>
         <tag>HEAD</tag>
diff --git a/src/main/java/ch/fritteli/labyrinth/server/handler/CreateHandler.java b/src/main/java/ch/fritteli/labyrinth/server/handler/CreateHandler.java
index 47da5f5..46cdfd4 100644
--- a/src/main/java/ch/fritteli/labyrinth/server/handler/CreateHandler.java
+++ b/src/main/java/ch/fritteli/labyrinth/server/handler/CreateHandler.java
@@ -8,13 +8,18 @@ import io.undertow.util.HttpString;
 import io.undertow.util.StatusCodes;
 import io.vavr.Tuple;
 import io.vavr.Tuple2;
-import io.vavr.collection.*;
+import io.vavr.collection.HashMap;
+import io.vavr.collection.HashMultimap;
+import io.vavr.collection.HashSet;
+import io.vavr.collection.List;
+import io.vavr.collection.Multimap;
+import io.vavr.collection.Set;
+import io.vavr.collection.Stream;
 import io.vavr.control.Option;
 import io.vavr.control.Try;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.Nullable;
-import org.slf4j.MDC;
 
 import java.nio.ByteBuffer;
 import java.time.Instant;
@@ -22,7 +27,6 @@ import java.time.temporal.ChronoUnit;
 import java.util.Deque;
 import java.util.Map;
 import java.util.Random;
-import java.util.UUID;
 
 @Slf4j
 public class CreateHandler extends AbstractHttpHandler {