ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

gradle: Update deps, format files (#1316)

Browse Source 
* gradle: Update dependencies

Also made the version numbers global to make updating easier, also this
way we can't have mismatches where different projects use diffrent
versions of a dep

* cache: Fix TitleDumper test

* gradle: Format build files

* httpserviceplus: Remove unneeded deps
This commit is contained in:
Owain van Brakel
2019-08-14 03:02:45 +02:00
committed by Ganom
parent ae2305f8d0
commit bd621269a6
21 changed files with 296 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
http-service/build.gradle
View File

@@ -1,32 +1,37 @@
apply plugin: 'war'
description = 'Web Service'
dependencies {
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.6.RELEASE'
implementation group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.1.6.RELEASE'
implementation group: 'org.springframework', name: 'spring-jdbc', version: '5.1.8.RELEASE'
implementation group: 'org.mapstruct', name: 'mapstruct-jdk8', version: '1.3.0.Final'
api project(':runelite-api')
api project(':http-api')
annotationProcessor group: 'org.mapstruct', name: 'mapstruct-processor', version: mapstruct
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok
api project(':cache')
implementation group: 'org.sql2o', name: 'sql2o', version: '1.6.0'
implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
implementation group: 'com.github.scribejava', name: 'scribejava-apis', version: '6.7.0'
implementation group: 'io.minio', name: 'minio', version: '6.0.8'
implementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: '3.10.2'
implementation(group: 'redis.clients', name: 'jedis', version: '3.1.0') {
api project(':http-api')
api project(':runelite-api')
implementation group: 'com.github.scribejava', name: 'scribejava-apis', version: scribejava
implementation group: 'com.google.code.gson', name: 'gson', version: gson
implementation group: 'com.google.guava', name: 'guava', version: guava
implementation group: 'io.minio', name: 'minio', version: minio
implementation group: 'org.mapstruct', name: 'mapstruct-jdk8', version: mapstruct
implementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: mongodbDriverSync
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
implementation group: 'org.springframework', name: 'spring-jdbc', version: springJdbc
implementation group: 'org.springframework.boot', name: 'spring-boot-devtools', version: springboot
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springboot
implementation group: 'org.sql2o', name: 'sql2o', version: sql2o
implementation(group: 'redis.clients', name: 'jedis', version: jedis) {
exclude(module: 'commons-pool2')
}
testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.1.6.RELEASE') {
providedCompile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: mariadbJdbc
providedCompile group: 'org.projectlombok', name: 'lombok', version: lombok
providedCompile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: springboot
testImplementation group: 'com.h2database', name: 'h2', version: '1.4.199'
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: okhttp3
testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springboot) {
exclude(module: 'commons-logging')
}
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.0.1'
testImplementation group: 'com.h2database', name: 'h2', version: '1.4.199'
providedCompile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: '2.1.6.RELEASE'
providedCompile group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.mapstruct', name: 'mapstruct-processor', version: '1.3.0.Final'
providedCompile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.4.2'
}

5
http-service/src/main/java/net/runelite/http/service/cache/CacheService.java vendored
View File

@@ -35,6 +35,7 @@ import io.minio.errors.InvalidArgumentException;
import io.minio.errors.InvalidBucketNameException;
import io.minio.errors.InvalidEndpointException;
import io.minio.errors.InvalidPortException;
import io.minio.errors.InvalidResponseException;
import io.minio.errors.NoResponseException;
import java.io.IOException;
import java.io.InputStream;
@@ -113,9 +114,7 @@ public class CacheService
{
return ByteStreams.toByteArray(in);
}
catch (InvalidBucketNameException | NoSuchAlgorithmException | InsufficientDataException
| IOException | InvalidKeyException | NoResponseException | XmlPullParserException
| ErrorResponseException | InternalException | InvalidArgumentException ex)
catch (InvalidBucketNameException | NoSuchAlgorithmException | InsufficientDataException | IOException | InvalidKeyException | NoResponseException | XmlPullParserException | ErrorResponseException | InternalException | InvalidArgumentException | InvalidResponseException ex)
{
log.warn(null, ex);
return null;