Skip to content

Commit 61dbc4d

Browse files
authored
Merge pull request #418 from kbase/update_java_common
Update java common jar
2 parents 7ac5999 + 09b2011 commit 61dbc4d

File tree

5 files changed

+4
-153
lines changed

5 files changed

+4
-153
lines changed

.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<classpathentry kind="lib" path="/jars/lib/jars/jackson/jackson-module-jaxb-annotations-2.5.4.jar"/>
2222
<classpathentry kind="lib" path="/jars/lib/jars/jetty/jetty-all-9.3.11.v20160721-uber.jar"/>
2323
<classpathentry kind="lib" path="/jars/lib/jars/mustache/compiler-0.9.3.jar"/>
24-
<classpathentry kind="lib" path="/jars/lib/jars/kbase/common/kbase-common-0.0.22.jar"/>
24+
<classpathentry kind="lib" path="/jars/lib/jars/kbase/common/kbase-common-0.2.0.jar"/>
2525
<classpathentry kind="lib" path="/jars/lib/jars/jersey/mvc/jersey-mvc-2.23.2.jar"/>
2626
<classpathentry kind="lib" path="/jars/lib/jars/jersey/mvc/jersey-mvc-mustache-2.23.2.jar"/>
2727
<classpathentry kind="lib" path="/jars/lib/jars/jersey/entity-filtering/jersey-entity-filtering-2.23.2.jar"/>

build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</fileset>
4141

4242
<fileset dir="${jardir}" id="logging">
43-
<include name="kbase/common/kbase-common-0.0.22.jar"/>
43+
<include name="kbase/common/kbase-common-0.2.0.jar"/>
4444
<include name="jna/jna-3.4.0.jar"/>
4545
<include name="logback/logback-core-1.1.2.jar"/>
4646
<include name="logback/logback-classic-1.1.2.jar"/>

src/us/kbase/test/auth2/MongoController.java

-150
This file was deleted.

src/us/kbase/test/auth2/MongoStorageTestManager.java

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import us.kbase.auth2.cryptutils.RandomDataGenerator;
2323
import us.kbase.auth2.lib.storage.mongo.MongoStorage;
24+
import us.kbase.common.test.controllers.mongo.MongoController;
2425

2526
public class MongoStorageTestManager {
2627

src/us/kbase/test/auth2/lib/storage/mongo/MongoStorageTester.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import us.kbase.auth2.cryptutils.RandomDataGenerator;
1414
import us.kbase.auth2.lib.storage.mongo.MongoStorage;
15-
import us.kbase.test.auth2.MongoController;
15+
import us.kbase.common.test.controllers.mongo.MongoController;
1616
import us.kbase.test.auth2.MongoStorageTestManager;
1717

1818
public class MongoStorageTester {

0 commit comments

Comments
 (0)