From b958d1f22cec5d776660957ca23a40e0b9c3ac19 Mon Sep 17 00:00:00 2001
From: Tomasz Rumak <tomasz.rumak@ubs.com>
Date: Mon, 17 Jun 2024 15:33:25 +0100
Subject: [PATCH] #1378 pom clean up to make java working

---
 benchmark/pom.xml                                          | 2 --
 example/apache-ignite/pom.xml                              | 2 --
 example/basket/pom.xml                                     | 2 --
 example/editable/pom.xml                                   | 2 --
 example/main-java/pom.xml                                  | 7 +++++--
 example/main/pom.xml                                       | 2 --
 example/order/pom.xml                                      | 2 --
 example/permission/pom.xml                                 | 2 --
 example/price/pom.xml                                      | 2 --
 example/virtualized-table/pom.xml                          | 2 --
 plugin/ignite-plugin/pom.xml                               | 2 --
 plugin/virtualized-table-plugin/pom.xml                    | 2 --
 pom.xml                                                    | 6 ++++++
 toolbox/pom.xml                                            | 2 --
 .../java/org/finos/vuu/util/ScalaCollectionConverter.java  | 2 +-
 vuu-ui/pom.xml                                             | 2 --
 vuu/pom.xml                                                | 4 ++++
 17 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 54397553f..a0aaf4a7f 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -40,8 +40,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/example/apache-ignite/pom.xml b/example/apache-ignite/pom.xml
index 8e02182a7..b5a5a9bd0 100644
--- a/example/apache-ignite/pom.xml
+++ b/example/apache-ignite/pom.xml
@@ -79,8 +79,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/example/basket/pom.xml b/example/basket/pom.xml
index 48f7c8d20..03ca7b3a1 100644
--- a/example/basket/pom.xml
+++ b/example/basket/pom.xml
@@ -53,8 +53,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/example/editable/pom.xml b/example/editable/pom.xml
index 89d361ce1..11783ca7e 100644
--- a/example/editable/pom.xml
+++ b/example/editable/pom.xml
@@ -42,8 +42,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/example/main-java/pom.xml b/example/main-java/pom.xml
index 6c325cd79..8fb44c541 100644
--- a/example/main-java/pom.xml
+++ b/example/main-java/pom.xml
@@ -16,6 +16,11 @@
             <artifactId>vuu</artifactId>
             <version>0.9.65-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.finos.vuu</groupId>
+            <artifactId>vuu-java</artifactId>
+            <version>0.9.65-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>org.finos.vuu</groupId>
@@ -71,8 +76,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/example/main/pom.xml b/example/main/pom.xml
index 0c0b778c3..e51e2415e 100644
--- a/example/main/pom.xml
+++ b/example/main/pom.xml
@@ -76,8 +76,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/example/order/pom.xml b/example/order/pom.xml
index 009797cb4..3f9a27d73 100644
--- a/example/order/pom.xml
+++ b/example/order/pom.xml
@@ -54,8 +54,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/example/permission/pom.xml b/example/permission/pom.xml
index 89b3ece2f..a5cf19890 100644
--- a/example/permission/pom.xml
+++ b/example/permission/pom.xml
@@ -42,8 +42,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/example/price/pom.xml b/example/price/pom.xml
index cd03fee97..b633fb950 100644
--- a/example/price/pom.xml
+++ b/example/price/pom.xml
@@ -42,8 +42,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/example/virtualized-table/pom.xml b/example/virtualized-table/pom.xml
index efa539029..77e44aa32 100644
--- a/example/virtualized-table/pom.xml
+++ b/example/virtualized-table/pom.xml
@@ -52,8 +52,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/plugin/ignite-plugin/pom.xml b/plugin/ignite-plugin/pom.xml
index c740c4c65..16542a66f 100644
--- a/plugin/ignite-plugin/pom.xml
+++ b/plugin/ignite-plugin/pom.xml
@@ -78,8 +78,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
 
diff --git a/plugin/virtualized-table-plugin/pom.xml b/plugin/virtualized-table-plugin/pom.xml
index f5dd74b31..428c57e8c 100644
--- a/plugin/virtualized-table-plugin/pom.xml
+++ b/plugin/virtualized-table-plugin/pom.xml
@@ -53,8 +53,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
 
diff --git a/pom.xml b/pom.xml
index 61ed86784..d8d11dc1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,12 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13.2</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/toolbox/pom.xml b/toolbox/pom.xml
index 09cd2a82f..c3675ceeb 100644
--- a/toolbox/pom.xml
+++ b/toolbox/pom.xml
@@ -22,8 +22,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/vuu-java/src/main/java/org/finos/vuu/util/ScalaCollectionConverter.java b/vuu-java/src/main/java/org/finos/vuu/util/ScalaCollectionConverter.java
index 194f9f8ea..05825fbf1 100644
--- a/vuu-java/src/main/java/org/finos/vuu/util/ScalaCollectionConverter.java
+++ b/vuu-java/src/main/java/org/finos/vuu/util/ScalaCollectionConverter.java
@@ -8,7 +8,7 @@
 public class ScalaCollectionConverter {
 
     public static <K, V> scala.collection.immutable.Map<K, V> toScala(Map<K, V> m) {
-        return scala.collection.immutable.Map.from(scala.jdk.CollectionConverters.MapHasAsScala(m).asScala());
+        return scala.collection.immutable.Map.from(CollectionConverters.MapHasAsScala(m).asScala());
     }
 
     public static <T> scala.collection.Iterable<T> toScala(Iterable<T> l) {
diff --git a/vuu-ui/pom.xml b/vuu-ui/pom.xml
index 289e26a13..2f632ae21 100644
--- a/vuu-ui/pom.xml
+++ b/vuu-ui/pom.xml
@@ -22,8 +22,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
         </dependency>
 
     </dependencies>
diff --git a/vuu/pom.xml b/vuu/pom.xml
index 4130ba026..a49bf264a 100644
--- a/vuu/pom.xml
+++ b/vuu/pom.xml
@@ -54,6 +54,10 @@
             <version>${scala.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.scalatest</groupId>