Author: massi
Date: Wed Jul 2 14:38:01 2014
New Revision: 1607379
URL: http://svn.apache.org/r1607379
Log:
Fixed #SYNCOPE-522
Modified:
syncope/trunk/installer/pom.xml
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/utilities/JsonUtils.java
syncope/trunk/installer/src/main/resources/izpack/install.xml
Modified: syncope/trunk/installer/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/pom.xml?rev=1607379&r1=1607378&r2=1607379&view=diff
==============================================================================
--- syncope/trunk/installer/pom.xml (original)
+++ syncope/trunk/installer/pom.xml Wed Jul 2 14:38:01 2014
@@ -64,6 +64,11 @@ under the License.
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
<dependency>
<groupId>org.postgresql</groupId>
@@ -77,12 +82,6 @@ under the License.
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.13</version>
- </dependency>
-
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
Modified:
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/utilities/JsonUtils.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/java/org/apache/syncope/installer/utilities/JsonUtils.java?rev=1607379&r1=1607378&r2=1607379&view=diff
==============================================================================
---
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/utilities/JsonUtils.java
(original)
+++
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/utilities/JsonUtils.java
Wed Jul 2 14:38:01 2014
@@ -18,10 +18,11 @@
*/
package org.apache.syncope.installer.utilities;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import org.apache.syncope.installer.containers.jboss.JBossAddResponse;
import org.apache.syncope.installer.containers.jboss.JBossDeployRequestContent;
-import org.codehaus.jackson.map.ObjectMapper;
public class JsonUtils {
@@ -32,7 +33,6 @@ public class JsonUtils {
try {
jBossAddResponse = objectMapper.readValue(responseBodyAsString,
JBossAddResponse.class);
} catch (IOException ioe) {
-
}
return jBossAddResponse;
}
@@ -41,8 +41,7 @@ public class JsonUtils {
String jBossDeployRequestContentString = "";
try {
jBossDeployRequestContentString =
objectMapper.writeValueAsString(jBossDeployRequestContent);
- } catch (IOException ioe) {
-
+ } catch (JsonProcessingException ioe) {
}
return jBossDeployRequestContentString;
}
Modified: syncope/trunk/installer/src/main/resources/izpack/install.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/resources/izpack/install.xml?rev=1607379&r1=1607378&r2=1607379&view=diff
==============================================================================
--- syncope/trunk/installer/src/main/resources/izpack/install.xml (original)
+++ syncope/trunk/installer/src/main/resources/izpack/install.xml Wed Jul 2
14:38:01 2014
@@ -141,8 +141,9 @@ under the License.
<jar src="lib/httpclient-4.3.4.jar"/>
<jar src="lib/httpmime-4.3.4.jar"/>
<jar src="lib/httpcore-4.3.2.jar"/>
- <jar src="lib/jackson-core-asl-1.9.13.jar"/>
- <jar src="lib/jackson-mapper-asl-1.9.13.jar"/>
+ <jar src="lib/jackson-databind-2.4.1.1.jar"/>
+ <jar src="lib/jackson-core-2.4.1.jar"/>
+ <jar src="lib/jackson-annotations-2.4.0.jar"/>
<panels>
<panel classname="HTMLHelloPanel" id="welcome"/>
