garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

various upgrades

Browse Source
This commit is contained in:
Athou
2015-06-04 14:55:36 +02:00
parent 5713a78f2e
commit 06373480ae
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@@ -17,7 +17,7 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<dropwizard.version>0.8.1</dropwizard.version> <dropwizard.version>0.8.1</dropwizard.version>
<guice.version>4.0</guice.version> <guice.version>4.0</guice.version>
<querydsl.version>3.6.3</querydsl.version> <querydsl.version>3.6.4</querydsl.version>
<rome.version>1.5.0</rome.version> <rome.version>1.5.0</rome.version>
</properties> </properties>
@@ -238,7 +238,7 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>4.4.1</version> <version>4.5</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -350,13 +350,13 @@
<dependency> <dependency>
<groupId>net.sourceforge.cssparser</groupId> <groupId>net.sourceforge.cssparser</groupId>
<artifactId>cssparser</artifactId> <artifactId>cssparser</artifactId>
<version>0.9.15</version> <version>0.9.16</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.apis</groupId> <groupId>com.google.apis</groupId>
<artifactId>google-api-services-youtube</artifactId> <artifactId>google-api-services-youtube</artifactId>
<version>v3-rev138-1.20.0</version> <version>v3-rev139-1.20.0</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
@@ -395,7 +395,7 @@
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>2.0.7-beta</version> <version>2.0.11-beta</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
src/main/java/com/commafeed/backend/HttpGetter.java
View File

@@ -181,7 +181,7 @@ public class HttpGetter {
builder.addInterceptorFirst(REMOVE_INCORRECT_CONTENT_ENCODING); builder.addInterceptorFirst(REMOVE_INCORRECT_CONTENT_ENCODING);
builder.disableAutomaticRetries(); builder.disableAutomaticRetries();
builder.setSslcontext(SSL_CONTEXT); builder.setSSLContext(SSL_CONTEXT);
builder.setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE); builder.setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE);
RequestConfig.Builder configBuilder = RequestConfig.custom(); RequestConfig.Builder configBuilder = RequestConfig.custom();