RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Vova Perebykivskyi 2016-04-27 14:28:21 +03:00 • committed by Dgray16
commit b0026fae37
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libreplan-webapp/pom.xml
View file

@ -466,13 +466,13 @@
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId> <artifactId>cxf-rt-frontend-jaxrs</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-xc</artifactId> <artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency> </dependency>
<!-- ZK Timeplot --> <!-- ZK Timeplot -->

12
libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java
View file

@ -26,10 +26,10 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.Status;
import com.fasterxml.jackson.databind.DeserializationFeature;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.client.WebClient;
import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
import org.codehaus.jackson.map.DeserializationConfig.Feature;
import org.libreplan.importers.jira.IssueDTO; import org.libreplan.importers.jira.IssueDTO;
import org.libreplan.importers.jira.SearchResultDTO; import org.libreplan.importers.jira.SearchResultDTO;
import org.libreplan.ws.cert.NaiveTrustProvider; import org.libreplan.ws.cert.NaiveTrustProvider;
@ -131,12 +131,10 @@ public class JiraRESTClient {
private static WebClient createClient(String url) { private static WebClient createClient(String url) {
JacksonJaxbJsonProvider jacksonJaxbJsonProvider = new JacksonJaxbJsonProvider(); JacksonJaxbJsonProvider jacksonJaxbJsonProvider = new JacksonJaxbJsonProvider();
jacksonJaxbJsonProvider.configure(Feature.FAIL_ON_UNKNOWN_PROPERTIES, jacksonJaxbJsonProvider.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
false);
return WebClient.create(url, return WebClient.create(url,
Collections.singletonList(jacksonJaxbJsonProvider)).accept( Collections.singletonList(jacksonJaxbJsonProvider)).accept(mediaTypes);
mediaTypes);
} }

12
pom.xml
View file

@ -563,14 +563,14 @@
<!-- jackson provider --> <!-- jackson provider -->
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>
<version>1.9.9</version> <version>2.7.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-xc</artifactId> <artifactId>jackson-module-jaxb-annotations</artifactId>
<version>1.9.9</version> <version>2.7.3</version>
</dependency> </dependency>
<!-- ZK Timeplot --> <!-- ZK Timeplot -->