From f2876144308066f69fcbaec44595560a725fc904 Mon Sep 17 00:00:00 2001
From: Kilian B <60846047+knowbased@users.noreply.github.com>
Date: Mon, 19 Aug 2024 15:14:18 +0200
Subject: [PATCH 1/2] chore: add aws and voyage in baseline requirement

---
 src/BaselineOfGitLabHealth/BaselineOfGitLabHealth.class.st | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BaselineOfGitLabHealth/BaselineOfGitLabHealth.class.st b/src/BaselineOfGitLabHealth/BaselineOfGitLabHealth.class.st
index cdaad70..be2c453 100644
--- a/src/BaselineOfGitLabHealth/BaselineOfGitLabHealth.class.st
+++ b/src/BaselineOfGitLabHealth/BaselineOfGitLabHealth.class.st
@@ -128,7 +128,7 @@ BaselineOfGitLabHealth >> definePackages: spec [
 		package: 'GLPHExtended-Model-Extension' with: [
 			spec requires:
 					#( 'GLPHExtended-Model' 'GitLabHealth-Model' 'GitLabHealth-Model-Extension' ) ];
-		package: 'GitLabHealth-Model-Analysis';
+		package: 'GitLabHealth-Model-Analysis' with: [ spec requires: #( 'Voyage' 'AWS' ) ];
 		package: 'GitLabHealth-Model-Analysis-Tests'
 		with: [ spec requires: #( 'GitLabHealth-Model-Analysis' ) ];
 		package: 'GitLabHealth-Visualization';

From 3fd9c396a7c8372b4ef5ce96a24627d29769c3f6 Mon Sep 17 00:00:00 2001
From: Kilian B <60846047+knowbased@users.noreply.github.com>
Date: Mon, 19 Aug 2024 15:35:21 +0200
Subject: [PATCH 2/2] chore: useLoaded for conflict in .smalltalk.ston

---
 .smalltalk.ston | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.smalltalk.ston b/.smalltalk.ston
index 45bd543..0b19fe0 100644
--- a/.smalltalk.ston
+++ b/.smalltalk.ston
@@ -6,7 +6,7 @@ SmalltalkCISpec {
       #directory : 'src',
       #load : [ 'default', 'Jira' ],
       #platforms : [ #pharo ],
-      #onConflict : #useIncoming,
+      #onConflict : #useLoaded,
       #onUpgrade : #useIncoming
     }
   ],