Skip to content

Commit

Permalink
support flink 0.11.1 and spark 3.0.0 only scala 2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
harbby committed Jul 25, 2020
1 parent 216cbbb commit f439e0c
Show file tree
Hide file tree
Showing 72 changed files with 475 additions and 2,703 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ allprojects {
}

ext.deps = [
flink : '1.10.1',
flink : '1.11.1',
jetty : "9.4.6.v20170531", //8.1.17.v20150415 "9.4.6.v20170531"
hadoop : "2.7.4",
hadoop : "2.8.3",
hbase : '1.1.2',
spark : "2.4.4",
spark : "3.0.0",
scala : '2.12.8',
joda_time : '2.9.3',
slf4j : '1.7.25',
guice : '4.2.1',
gadtry : '1.6.3',
gadtry : '1.7.1',
guava : '27.0-jre',
jackson : '2.9.5',
jersey : '2.28',
Expand All @@ -52,7 +52,7 @@ subprojects {

repositories {
mavenLocal()
//maven{ url 'http://maven.aliyun.com/nexus/content/groups/public'}
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public'}
mavenCentral()
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
4 changes: 0 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,19 @@ include 'sylph-connectors:flink-kafka'
include 'sylph-connectors:sylph-mysql'
include 'sylph-connectors:sylph-hdfs'
include 'sylph-connectors:flink-hdfs2'
include 'sylph-connectors:flink-kafka08'
include 'sylph-connectors:flink-kafka09'
//include 'sylph-connectors:sylph-hbase'
include 'sylph-connectors:sylph-elasticsearch6'
include 'sylph-connectors:sylph-elasticsearch5'
include 'sylph-connectors:sylph-clickhouse'
include 'sylph-connectors:sylph-kudu'

include 'sylph-connectors:spark-kafka'
include 'sylph-connectors:spark-kafka08'

//----
include 'sylph-dist'
include 'sylph-parser'
include 'sylph-docs'
include 'sylph-yarn'
include 'sylph-base-kafka'
//include 'sylph-cli'
include 'sylph-base-jdbc'

12 changes: 0 additions & 12 deletions sylph-base-kafka/build.gradle

This file was deleted.

2 changes: 1 addition & 1 deletion sylph-connectors/flink-hdfs2/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
compile group: 'joda-time', name: 'joda-time', version: deps.joda_time
compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: deps.hadoop
compileOnly(group: 'org.apache.flink', name: 'flink-streaming-scala_2.11', version: deps.flink) {
compileOnly(group: 'org.apache.flink', name: 'flink-streaming-scala_2.12', version: deps.flink) {
exclude(module: 'flink-shaded-hadoop2')
}
}
13 changes: 9 additions & 4 deletions sylph-connectors/flink-kafka/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
dependencies {
compileOnly project(':sylph-runners:sylph-runner-flink')

compileOnly(group: 'org.apache.flink', name: 'flink-streaming-scala_2.11', version: deps.flink) {
compileOnly(group: 'org.apache.flink', name: 'flink-streaming-scala_2.12', version: deps.flink) {
exclude(module: 'flink-shaded-hadoop2')
}
compile group: 'org.apache.flink', name: 'flink-connector-kafka-0.10_2.11', version: deps.flink

compile project(':sylph-base-kafka')
compile group: 'org.apache.flink', name: 'flink-connector-kafka-0.11_2.12', version: deps.flink

compileOnly project(":sylph-api")
compile 'com.jayway.jsonpath:json-path:2.4.0'

testCompile group: 'org.javassist', name: 'javassist', version: '3.26.0-GA'
testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: deps.jackson
compile group: 'com.github.harbby', name: 'gadtry', version: deps.gadtry

testCompile project(':sylph-runners:sylph-runner-flink')
testCompile project(':sylph-spi')
Expand Down
15 changes: 0 additions & 15 deletions sylph-connectors/flink-kafka08/build.gradle

This file was deleted.

This file was deleted.

Loading

0 comments on commit f439e0c

Please sign in to comment.