From 62ffd53576b79893a4e673df2991f379bc9ddf88 Mon Sep 17 00:00:00 2001
From: "Jurgen J. Vinju" <Jurgen.Vinju@cwi.nl>
Date: Thu, 13 Jun 2024 21:10:48 +0200
Subject: [PATCH 1/5] minor refactoring

---
 src/org/rascalmpl/library/lang/rascal/vis/ImportGraph.rsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/rascalmpl/library/lang/rascal/vis/ImportGraph.rsc b/src/org/rascalmpl/library/lang/rascal/vis/ImportGraph.rsc
index 9180f8ea8d9..d0cf35f6a1e 100644
--- a/src/org/rascalmpl/library/lang/rascal/vis/ImportGraph.rsc
+++ b/src/org/rascalmpl/library/lang/rascal/vis/ImportGraph.rsc
@@ -87,8 +87,8 @@ ProjectModel getProjectModel(loc file) {
 
         return projectModel(
             modules = {name},
-            imports = {<name, i> | i <- imps},
-            extends = {<name, e> | e <- exts}
+            imports = {name} * imps,
+            extends = {name} * exts
         );
     }
     catch ParseError(_) : 

From 8af61f3854e51a87068e4f942d608773b4992986 Mon Sep 17 00:00:00 2001
From: "Jurgen J. Vinju" <Jurgen.Vinju@cwi.nl>
Date: Thu, 13 Jun 2024 21:11:14 +0200
Subject: [PATCH 2/5] let shader rename jansi for compatibility with maven
 runtime

---
 pom.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b5e31ebddb..658925fa484 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,9 +293,12 @@
                                     <resource>io/usethesource/vallang/type/types.config </resource>
                                 </transformer>
                             </transformers>
-                            <!--
-                                    http://zhentao-li.blogspot.nl/2012/06/maven-shade-plugin-invalid-signature.html
-                                -->
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.fusesource.jansi</pattern>
+                                    <shadedPattern>org.rascampl.fusesource.jansi</shadedPattern>
+                                </relocation>
+                            </relocations>
                             <filters>
                                 <filter>
                                     <artifact>*:*</artifact>

From 8680168adecb0032f099536212a4e42fedede030 Mon Sep 17 00:00:00 2001
From: "Jurgen J. Vinju" <Jurgen.Vinju@cwi.nl>
Date: Thu, 13 Jun 2024 21:31:06 +0200
Subject: [PATCH 3/5] ConsoleRascalMonitor was not printing steps

---
 src/org/rascalmpl/interpreter/ConsoleRascalMonitor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/rascalmpl/interpreter/ConsoleRascalMonitor.java b/src/org/rascalmpl/interpreter/ConsoleRascalMonitor.java
index 51b1932bd29..0149a11c1ad 100644
--- a/src/org/rascalmpl/interpreter/ConsoleRascalMonitor.java
+++ b/src/org/rascalmpl/interpreter/ConsoleRascalMonitor.java
@@ -38,8 +38,8 @@ public int jobEnd(String name, boolean succeeded) {
 
 	@Override
 	public void jobStep(String name, String msg, int inc) {
-		//out.println(name);
-		//out.flush();
+		out.println(name);
+		out.flush();
 	}
 
 	@Override

From 80280ff2484eef21f2c674cfb05862484aba946b Mon Sep 17 00:00:00 2001
From: Davy Landman <davy.landman@swat.engineering>
Date: Fri, 14 Jun 2024 08:47:31 +0200
Subject: [PATCH 4/5] Fixed relocation rules to also shade jline and avoid
 jansi internal

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 658925fa484..6652bd7c36b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,6 +297,13 @@
                                 <relocation>
                                     <pattern>org.fusesource.jansi</pattern>
                                     <shadedPattern>org.rascampl.fusesource.jansi</shadedPattern>
+                                    <excludes>
+                                        <exclude>org.fusesource.jansi.internal.*</exclude>
+                                    </excludes>
+                                </relocation>
+                                <relocation>
+                                    <pattern>jline</pattern>
+                                    <shadedPattern>org.rascampl.jline</shadedPattern>
                                 </relocation>
                             </relocations>
                             <filters>

From 59301987a08431e3a2f30347b3ac985577d1740a Mon Sep 17 00:00:00 2001
From: "Jurgen J. Vinju" <Jurgen.Vinju@cwi.nl>
Date: Fri, 14 Jun 2024 10:57:16 +0200
Subject: [PATCH 5/5] typo

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

diff --git a/pom.xml b/pom.xml
index 6652bd7c36b..7cbd692910e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -296,14 +296,14 @@
                             <relocations>
                                 <relocation>
                                     <pattern>org.fusesource.jansi</pattern>
-                                    <shadedPattern>org.rascampl.fusesource.jansi</shadedPattern>
+                                    <shadedPattern>org.rascalmpl.fusesource.jansi</shadedPattern>
                                     <excludes>
                                         <exclude>org.fusesource.jansi.internal.*</exclude>
                                     </excludes>
                                 </relocation>
                                 <relocation>
                                     <pattern>jline</pattern>
-                                    <shadedPattern>org.rascampl.jline</shadedPattern>
+                                    <shadedPattern>org.rascalmpl.jline</shadedPattern>
                                 </relocation>
                             </relocations>
                             <filters>