From 7321696ae1bb8c325822066901edebecbe8949ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8C=C3=AD=C5=BEek?=
 <tomascizek@gmail.com>
Date: Fri, 4 Aug 2023 02:18:02 +0200
Subject: [PATCH 1/4] fix arango connection from app

---
 src/main/resources/application.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 772805e..28bfc0c 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
 arango.arangodb.user=${ARANGO_USERNAME:root}
 arango.arangodb.password=${ARANGO_PASSWORD:rootpassword}
-arango.arangodb.host=${ARANGO_HOST:127.0.0.1}
-arango.arangodb.port=${ARANGO_PORT:8555}
\ No newline at end of file
+arango.arangodb.host=${ARANGO_HOST:arangodb}
+arango.arangodb.port=${ARANGO_PORT:8529}
\ No newline at end of file

From c960e0b4b8a729ade7e024664a834414d73a7f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8C=C3=AD=C5=BEek?=
 <tomascizek@gmail.com>
Date: Fri, 4 Aug 2023 02:18:23 +0200
Subject: [PATCH 2/4] Improve makefile

---
 Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index dbb9cc6..639d82b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,17 +2,20 @@ startd:
 	docker-compose up -d
 	
 start:
-	docker-compose up
+	docker-compose up axon-server arangodb stapi-admin app
 	
 start-services:
-	docker-compose up axon-server stapi-admin -d
+	docker-compose up axon-server arangodb stapi-admin -d
 
 start-be:
-	docker-compose up axon-server app
+	docker-compose up axon-server arangodb app
 
 start-axon:
 	docker-compose up axon-server
 
+start-arango:
+	docker-compose up axon-server
+
 start-admin:
 	docker-compose up stapi-admin
 

From c501781624776998127d1d2be3373dab976f0ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8C=C3=AD=C5=BEek?=
 <tomascizek@gmail.com>
Date: Fri, 4 Aug 2023 02:18:54 +0200
Subject: [PATCH 3/4] Update versions of libraries

---
 pom.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0a5f8f9..6318076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,10 +14,9 @@
 	</parent>
 	<properties>
 		<java.version>17</java.version>
-		<spring.boot.version>3.1.0</spring.boot.version>
-		<stapi.axon.version>0.0.25</stapi.axon.version>
-		<stapi.arango.version>0.0.1-SNAPSHOT</stapi.arango.version>
-		<stapi.core.version>0.1.4</stapi.core.version>
+		<spring.boot.version>3.2.0</spring.boot.version>
+		<stapi.axon.version>0.2.3</stapi.axon.version>
+		<stapi.arango.version>0.0.2</stapi.arango.version>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
@@ -27,6 +26,11 @@
 			<artifactId>axon-system-plugin</artifactId>
 			<version>${stapi.axon.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>ai.stapi</groupId>
+			<artifactId>form-api</artifactId>
+			<version>${stapi.axon.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>ai.stapi</groupId>
 			<artifactId>arango-axon</artifactId>
@@ -37,11 +41,6 @@
 			<artifactId>graphql-api</artifactId>
 			<version>${stapi.axon.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>ai.stapi</groupId>
-			<artifactId>form-api</artifactId>
-			<version>${stapi.core.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>ai.stapi</groupId>
 			<artifactId>axon-test</artifactId>

From c99eb4de754d99b55147d479a83ac2be1ee65098 Mon Sep 17 00:00:00 2001
From: clickout <mick.voros@gmail.com>
Date: Mon, 7 Aug 2023 12:57:31 +0200
Subject: [PATCH 4/4] Fix Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 639d82b..3ad984d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ start-axon:
 	docker-compose up axon-server
 
 start-arango:
-	docker-compose up axon-server
+	docker-compose up arangodb
 
 start-admin:
 	docker-compose up stapi-admin