Merge pull request kbase#418 from kbase/update_java_common

Update java common jar
MrCreosote · Feb 8, 2024 · 61dbc4d · 61dbc4d
2 parents 7ac5999 + 09b2011
commit 61dbc4d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 153 deletions.
diff --git a/.classpath b/.classpath
@@ -21,7 +21,7 @@
 	<classpathentry kind="lib" path="/jars/lib/jars/jackson/jackson-module-jaxb-annotations-2.5.4.jar"/>
 	<classpathentry kind="lib" path="/jars/lib/jars/jetty/jetty-all-9.3.11.v20160721-uber.jar"/>
 	<classpathentry kind="lib" path="/jars/lib/jars/mustache/compiler-0.9.3.jar"/>
-	<classpathentry kind="lib" path="/jars/lib/jars/kbase/common/kbase-common-0.0.22.jar"/>
+	<classpathentry kind="lib" path="/jars/lib/jars/kbase/common/kbase-common-0.2.0.jar"/>
 	<classpathentry kind="lib" path="/jars/lib/jars/jersey/mvc/jersey-mvc-2.23.2.jar"/>
 	<classpathentry kind="lib" path="/jars/lib/jars/jersey/mvc/jersey-mvc-mustache-2.23.2.jar"/>
 	<classpathentry kind="lib" path="/jars/lib/jars/jersey/entity-filtering/jersey-entity-filtering-2.23.2.jar"/>

diff --git a/build.xml b/build.xml
@@ -40,7 +40,7 @@
   </fileset>
 
   <fileset dir="${jardir}" id="logging">
-    <include name="kbase/common/kbase-common-0.0.22.jar"/>
+    <include name="kbase/common/kbase-common-0.2.0.jar"/>
     <include name="jna/jna-3.4.0.jar"/>
     <include name="logback/logback-core-1.1.2.jar"/>
     <include name="logback/logback-classic-1.1.2.jar"/>

diff --git a/src/us/kbase/test/auth2/MongoController.java b/src/us/kbase/test/auth2/MongoController.java
diff --git a/src/us/kbase/test/auth2/MongoStorageTestManager.java b/src/us/kbase/test/auth2/MongoStorageTestManager.java
@@ -21,6 +21,7 @@
 
 import us.kbase.auth2.cryptutils.RandomDataGenerator;
 import us.kbase.auth2.lib.storage.mongo.MongoStorage;
+import us.kbase.common.test.controllers.mongo.MongoController;
 
 public class MongoStorageTestManager {
 

diff --git a/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTester.java b/src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTester.java
@@ -12,7 +12,7 @@
 
 import us.kbase.auth2.cryptutils.RandomDataGenerator;
 import us.kbase.auth2.lib.storage.mongo.MongoStorage;
-import us.kbase.test.auth2.MongoController;
+import us.kbase.common.test.controllers.mongo.MongoController;
 import us.kbase.test.auth2.MongoStorageTestManager;
 
 public class MongoStorageTester {