yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-11-13 17:59:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Scala to 2.11, fix travis build (#1316)

Browse Source
This commit is contained in:
Yi (Alan) Wang 2018-08-13 09:45:52 -07:00 committed by GitHub
parent 48dc55436c
commit 999ab051ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -8,7 +8,7 @@ jdk:
- oraclejdk8 - oraclejdk8
env: env:
- DOCKER_COMPOSE_VERSION=1.14.0 - DOCKER_COMPOSE_VERSION=1.22.0
services: services:
- docker - docker
@ -16,7 +16,7 @@ services:
before_install: before_install:
# elasticsearch # elasticsearch
- curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.3/elasticsearch-2.3.3.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.3.deb && sudo service elasticsearch restart - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.5/elasticsearch-2.3.5.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.5.deb && sudo service elasticsearch restart
# extralibs # extralibs
- wget https://github.com/ericsun2/sandbox/raw/master/extralibs/extralibs.zip - wget https://github.com/ericsun2/sandbox/raw/master/extralibs/extralibs.zip

2
gradle/scripts/coverage.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'com.palantir.jacoco-full-report'
apply plugin: 'jacoco' apply plugin: 'jacoco'
// Must match the version used in jacoco4sbt plugin. // Must match the version used in jacoco4sbt plugin.
ext.jacocoVersion = '0.7.1.201405082137' ext.jacocoVersion = '0.8.1'
jacoco { jacoco {
toolVersion = jacocoVersion toolVersion = jacocoVersion

12
gradle/scripts/dependency.gradle
View File

@ -27,14 +27,16 @@ ext.externalDependency = [
"logback" : "ch.qos.logback:logback-classic:1.2.3", "logback" : "ch.qos.logback:logback-classic:1.2.3",
"jasypt" : "org.jasypt:jasypt:1.9.2", "jasypt" : "org.jasypt:jasypt:1.9.2",
"mockito" : "org.mockito:mockito-core:2.13.0", "mockito" : "org.mockito:mockito-core:2.13.0",
"festAssert" : "org.easytesting:fest-assert-core:2.0M10",
"systemRules" : "com.github.stefanbirkner:system-rules:1.16.0",
"play_java_jdbc" : "com.typesafe.play:play-java-jdbc_2.10:2.4.11", "play_java_jdbc" : "com.typesafe.play:play-java-jdbc_2.11:2.4.11",
"play_java_ws" : "com.typesafe.play:play-java-ws_2.10:2.4.11", "play_java_ws" : "com.typesafe.play:play-java-ws_2.11:2.4.11",
"play_cache" : "com.typesafe.play:play-cache_2.10:2.4.11", "play_cache" : "com.typesafe.play:play-cache_2.11:2.4.11",
"play_filter" : "com.typesafe.play:filters-helpers_2.10:2.4.11", "play_filter" : "com.typesafe.play:filters-helpers_2.11:2.4.11",
"typesafe_config" : "com.typesafe:config:1.3.1", "typesafe_config" : "com.typesafe:config:1.3.1",
"netty" : "io.netty:netty:3.10.6.Final", "netty" : "io.netty:netty:3.10.6.Final",
"akka" : "com.typesafe.akka:akka-actor_2.10:2.3.16", "akka" : "com.typesafe.akka:akka-actor_2.11:2.3.16",
"spring_jdbc" : "org.springframework:spring-jdbc:4.1.9.RELEASE", "spring_jdbc" : "org.springframework:spring-jdbc:4.1.9.RELEASE",
"kafka_clients" : "org.apache.kafka:kafka-clients:0.10.2.1", "kafka_clients" : "org.apache.kafka:kafka-clients:0.10.2.1",

4
wherehows-backend/build.gradle
View File

@ -14,8 +14,8 @@ dependencies {
play externalDependency.slf4j_api play externalDependency.slf4j_api
play externalDependency.jasypt play externalDependency.jasypt
playTest 'com.github.stefanbirkner:system-rules:1.16.0' playTest externalDependency.systemRules
playTest 'org.easytesting:fest-assert-core:2.0M10' playTest externalDependency.festAssert
playTest externalDependency.mockito playTest externalDependency.mockito
} }

2
wherehows-frontend/build.gradle
View File

@ -19,7 +19,7 @@ dependencies{
play externalDependency.play_cache play externalDependency.play_cache
play externalDependency.mysql play externalDependency.mysql
playTest 'org.easytesting:fest-assert-core:2.0M10' playTest externalDependency.festAssert
playTest externalDependency.mockito playTest externalDependency.mockito
} }