SP-111 / BIS-49: JSON-RPC - properly handle circular dependencies

SVN: 25668

datastore_server/build/build.xml

@@ -276,8 +276,9 @@
     <copy file="${lib}/poi/ooxml-lib/geronimo-stax-api_1.0_spec-1.0.jar" todir="${dist.datastore_server.lib}" />
     <copy file="${lib}/poi/ooxml-lib/xmlbeans-2.3.0.jar" todir="${dist.datastore_server.lib}" />
     <copy file="${lib}/jsonrpc4j/jsonrpc4j.jar" todir="${dist.datastore_server.lib}" />
-    <copy file="${lib}/jackson/jackson-core-asl.jar" todir="${dist.datastore_server.lib}" />
-    <copy file="${lib}/jackson/jackson-mapper-asl.jar" todir="${dist.datastore_server.lib}" />
+    <copy file="${lib}/jackson/jackson-annotations.jar" todir="${dist.datastore_server.lib}" />
+    <copy file="${lib}/jackson/jackson-core.jar" todir="${dist.datastore_server.lib}" />
+    <copy file="${lib}/jackson/jackson-databind.jar" todir="${dist.datastore_server.lib}" />
     <copy file="${lib}/sshd/sshd-core.jar" todir="${dist.datastore_server.lib}" />
   	
   	<!-- The dss_upload_gui folder is no longer needed; clean it up here (not in the task that makes the zip) -->

openbis/build/build.xml

@@ -496,10 +496,13 @@
         <include name="jsonrpc4j.jar" />
       </fileset>
       <fileset dir="${lib}/jackson">
-        <include name="jackson-core-asl.jar" />
+        <include name="jackson-annotations.jar" />
       </fileset>
       <fileset dir="${lib}/jackson">
-        <include name="jackson-mapper-asl.jar" />
+        <include name="jackson-core.jar" />
+      </fileset>
+      <fileset dir="${lib}/jackson">
+        <include name="jackson-databind.jar" />
       </fileset>
     </copy>
     <copy todir="${targets.www.web-inf}">
@@ -799,10 +802,13 @@
         <include name="jsonrpc4j.jar" />
       </lib>
       <lib dir="${lib}/jackson">
-        <include name="jackson-core-asl.jar" />
+        <include name="jackson-annotations.jar" />
+      </lib>
+      <lib dir="${lib}/jackson">
+        <include name="jackson-core.jar" />
       </lib>
       <lib dir="${lib}/jackson">
-        <include name="jackson-mapper-asl.jar" />
+        <include name="jackson-databind.jar" />
       </lib>
     </war>
     <!-- Does some cleaning. -->

openbis_knime/.classpath

@@ -22,8 +22,6 @@
 	<classpathentry kind="lib" path="/libraries/knime/eclipse-equinox-common.jar"/>
 	<classpathentry kind="lib" path="/libraries/knime/eclipse-osgi.jar"/>
 	<classpathentry kind="lib" path="/libraries/commons-io/commons-io.jar" sourcepath="/libraries/commons-io/src.zip"/>
-	<classpathentry kind="lib" path="/libraries/jackson/jackson-annotations.jar"/>
-	<classpathentry kind="lib" path="/libraries/jackson/jackson-core.jar"/>
-	<classpathentry kind="lib" path="/libraries/jackson/jackson-databind.jar"/>
+	<classpathentry kind="lib" path="/libraries/jackson-old/jackson-core-asl.jar"/>
 	<classpathentry kind="output" path="targets/classes"/>
 </classpath>