Skip to content

Commit

Permalink
Revert "Change java client to okhttp-gson for patch requests"
Browse files Browse the repository at this point in the history 
This reverts commit fecc4e8.
  • Loading branch information
@alpgurtan
alpgurtan committed Aug 3, 2017
1 parent 5f6bf20 commit 61575a1
Showing 1 changed file with 53 additions and 29 deletions.
82 changes: 53 additions & 29 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<artifactId>java-sdk</artifactId>
<artifactVersion>1.0.0</artifactVersion>
<dateLibrary>joda</dateLibrary>
<library>okhttp-gson</library>
<library>jersey2</library>
<sortParamsByRequiredFlag>false</sortParamsByRequiredFlag>
<useBeanValidation>true</useBeanValidation>
<performBeanValidation>true</performBeanValidation>
Expand All @@ -68,60 +68,84 @@

<!-- HTTP client: jersey-client -->
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp-version}</version>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>logging-interceptor</artifactId>
<version>${okhttp-version}</version>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey-version}</version>
</dependency>

<!-- JSON processing: jackson -->
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson-version}</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-version}</version>
</dependency>

<!-- Joda time: if you use it -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${jodatime-version}</version>
</dependency>

<!-- Bean Validation API support -->
<!-- bean validation: if you use it -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${javax-version}</version>
<scope>provided</scope>
</dependency>

<!-- Bean Validation Impl. used to perform BeanValidation -->
<!-- Base64 encoding that works in both JVM and Android -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-version}</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>${javax-el-version}</version>
<groupId>com.brsanthu</groupId>
<artifactId>migbase64</artifactId>
<version>${base64-version}</version>
</dependency>
</dependencies>

<properties>
<swagger-codegen-maven-plugin-version>2.2.3-SNAPSHOT</swagger-codegen-maven-plugin-version>
<swagger-codegen-maven-plugin-version>2.2.3</swagger-codegen-maven-plugin-version>
<swagger-annotations-version>1.5.8</swagger-annotations-version>
<okhttp-version>2.7.5</okhttp-version>
<gson-version>2.6.2</gson-version>
<jodatime-version>2.9.3</jodatime-version>
<junit-version>4.12</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<hibernate-version>5.2.2.Final</hibernate-version>
<jersey-version>2.25.1</jersey-version>
<jackson-version>2.8.9</jackson-version>
<javax-version>1.1.0.Final</javax-version>
<javax-el-version>2.2</javax-el-version>
<jodatime-version>2.7</jodatime-version>
<base64-version>2.2</base64-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.8.1</junit-version>
</properties>
</project>

0 comments on commit 61575a1

Please sign in to comment.