Skip to content

Commit 2d72e56

Browse files
author
TanyaEf
committed
Changed dependensies
1 parent f50e395 commit 2d72e56

File tree

2 files changed

+33
-16
lines changed

2 files changed

+33
-16
lines changed

pom.xml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<powermock.version>1.5.5</powermock.version>
17-
<jersey.version>2.13</jersey.version>
18-
<fasterxml.version>2.3.2</fasterxml.version>
17+
<!-- <jersey.version>2.13</jersey.version>
18+
<fasterxml.version>2.3.2</fasterxml.version> -->
1919
</properties>
2020

2121
<scm>
@@ -48,7 +48,7 @@
4848
<version>6.0.1</version>
4949
</dependency>
5050

51-
<!-- Jersey -->
51+
<!-- Jersey
5252
<dependency>
5353
<groupId>org.glassfish.jersey.core</groupId>
5454
<artifactId>jersey-client</artifactId>
@@ -68,9 +68,30 @@
6868
<groupId>org.glassfish.jersey.media</groupId>
6969
<artifactId>jersey-media-multipart</artifactId>
7070
<version>${jersey.version}</version>
71+
</dependency>-->
72+
73+
<dependency>
74+
<groupId>org.glassfish.jersey.core</groupId>
75+
<artifactId>jersey-client</artifactId>
76+
<version>2.5</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>com.sun.jersey</groupId>
80+
<artifactId>jersey-json</artifactId>
81+
<version>1.18</version>
82+
</dependency>
83+
<dependency>
84+
<groupId>com.sun.jersey.contribs</groupId>
85+
<artifactId>jersey-multipart</artifactId>
86+
<version>1.17</version>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.glassfish.jersey.media</groupId>
90+
<artifactId>jersey-media-json-jackson</artifactId>
91+
<version>2.5.1</version>
7192
</dependency>
7293

73-
<!-- Jackson -->
94+
<!-- Jackson
7495
<dependency>
7596
<groupId>com.fasterxml.jackson.dataformat</groupId>
7697
<artifactId>jackson-dataformat-yaml</artifactId>
@@ -80,7 +101,7 @@
80101
<groupId>com.fasterxml.jackson.dataformat</groupId>
81102
<artifactId>jackson-dataformat-xml</artifactId>
82103
<version>${fasterxml.version}</version>
83-
</dependency>
104+
</dependency>-->
84105

85106
<!-- TestNG -->
86107
<dependency>

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/SessionStorage.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,20 @@
2424
import com.fasterxml.jackson.databind.DeserializationFeature;
2525
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
2626
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
27-
2827
import com.jaspersoft.jasperserver.jaxrs.client.providers.CustomRepresentationTypeProvider;
29-
import org.glassfish.jersey.client.ClientProperties;
30-
import org.glassfish.jersey.filter.LoggingFilter;
31-
import org.glassfish.jersey.jackson.JacksonFeature;
32-
import org.glassfish.jersey.media.multipart.internal.MultiPartWriter;
33-
import org.slf4j.bridge.SLF4JBridgeHandler;
34-
35-
28+
import java.security.SecureRandom;
29+
import java.util.logging.Logger;
3630
import javax.net.ssl.HostnameVerifier;
3731
import javax.net.ssl.SSLContext;
3832
import javax.net.ssl.SSLSession;
3933
import javax.ws.rs.client.Client;
4034
import javax.ws.rs.client.ClientBuilder;
4135
import javax.ws.rs.client.WebTarget;
42-
43-
import java.security.SecureRandom;
44-
import java.util.logging.Logger;
36+
import org.glassfish.jersey.client.ClientProperties;
37+
import org.glassfish.jersey.filter.LoggingFilter;
38+
import org.glassfish.jersey.jackson.JacksonFeature;
39+
import org.glassfish.jersey.media.multipart.internal.MultiPartWriter;
40+
import org.slf4j.bridge.SLF4JBridgeHandler;
4541

4642

4743
public class SessionStorage {

0 commit comments

Comments
 (0)