Skip to content

Commit 35f1363

Browse files
author
Claudio Fahey
committed
Fixes to allow running in Nautilus SDK Desktop.
- Added Pravega credentials dependency to all projects - Flink JAR can now be published to Nautilus Maven repo. - Hadoop examples can now be run without Hadoop installed. - Spark examples can now be run without Spark installed. Signed-off-by: Claudio Fahey <[email protected]>
1 parent e0d152c commit 35f1363

File tree

9 files changed

+54
-5
lines changed

9 files changed

+54
-5
lines changed

flink-connector-examples/build.gradle

+24
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ apply plugin: "scala"
1717
apply plugin: "distribution"
1818
apply plugin: 'idea'
1919
apply plugin: 'eclipse'
20+
apply plugin: 'maven-publish'
2021

2122
sourceCompatibility = "1.8"
2223
archivesBaseName = 'pravega-flink-examples'
@@ -31,13 +32,18 @@ dependencies {
3132
compile "org.apache.flink:flink-streaming-java_2.11:${flinkVersion}"
3233
compile "org.apache.flink:flink-streaming-scala_2.11:${flinkVersion}"
3334
compile "org.slf4j:slf4j-log4j12:1.7.25"
35+
if (includePravegaCredentials.toBoolean()) {
36+
compile "io.pravega:pravega-keycloak-credentials:${pravegaCredentialsVersion}"
37+
}
3438
}
3539

3640
shadowJar {
3741
dependencies {
3842
include dependency("org.scala-lang.modules:scala-java8-compat_2.11")
3943
include dependency("io.pravega:pravega-connectors-flink_2.11")
4044
}
45+
classifier = ""
46+
zip64 true
4147
}
4248

4349
task scriptWordCountWriter(type: CreateStartScripts) {
@@ -111,3 +117,21 @@ distributions {
111117
}
112118
}
113119
}
120+
121+
publishing {
122+
repositories {
123+
maven {
124+
credentials {
125+
username "nautilus"
126+
password "password"
127+
}
128+
url = "http://repo/maven2"
129+
}
130+
}
131+
132+
publications {
133+
shadow(MavenPublication) { publication ->
134+
project.shadow.component(publication)
135+
}
136+
}
137+
}

gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
### dependencies
1111
pravegaVersion=0.4.0
1212
flinkConnectorVersion=0.4.0
13+
includePravegaCredentials=false
14+
pravegaCredentialsVersion=0.4.0-2030.d99411b-0.0.1-020.26736d2
1315

1416
### Pravega-samples output library
1517
samplesVersion=0.5.0-SNAPSHOT

hadoop-connector-examples/build.gradle

+7-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,13 @@ repositories {
3535
}
3636

3737
dependencies {
38-
compile "io.pravega:pravega-connectors-hadoop:${hadoopConnectorVersion}"
39-
compileOnly "org.apache.hadoop:hadoop-common:${hadoopVersion}"
40-
compileOnly "org.apache.hadoop:hadoop-mapreduce-client-core:${hadoopVersion}"
41-
compileOnly "org.apache.spark:spark-core_2.11:${sparkVersion}"
38+
compile "io.pravega:pravega-connectors-hadoop:${hadoopConnectorVersion}"
39+
compile "org.apache.hadoop:hadoop-common:${hadoopVersion}"
40+
compile "org.apache.hadoop:hadoop-mapreduce-client-core:${hadoopVersion}"
41+
compile "org.apache.spark:spark-core_2.11:${sparkVersion}"
42+
if (includePravegaCredentials.toBoolean()) {
43+
compile "io.pravega:pravega-keycloak-credentials:${pravegaCredentialsVersion}"
44+
}
4245
}
4346

4447
shadowJar {

hadoop-connector-examples/src/main/java/io/pravega/example/spark/wordcount/WordCount.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.apache.hadoop.io.Text;
1919
import org.apache.hadoop.util.GenericOptionsParser;
2020
import org.apache.spark.SparkConf;
21+
import org.apache.spark.SparkContext;
2122
import org.apache.spark.api.java.JavaPairRDD;
2223
import org.apache.spark.api.java.JavaRDD;
2324
import org.apache.spark.api.java.JavaSparkContext;
@@ -46,7 +47,8 @@ public static void main(String[] args) throws Exception {
4647
conf.setStrings(PravegaConfig.INPUT_STREAM_NAME, remainingArgs[2]);
4748
conf.setStrings(PravegaConfig.INPUT_DESERIALIZER, TextSerializer.class.getName());
4849

49-
JavaSparkContext sc = new JavaSparkContext(new SparkConf());
50+
SparkConf sparkConf = new SparkConf().setAppName("wordcount").setMaster("local[1]");
51+
JavaSparkContext sc = new JavaSparkContext(SparkContext.getOrCreate(sparkConf));
5052

5153
JavaPairRDD<EventKey, Text> lines = sc.newAPIHadoopRDD(conf, PravegaInputFormat.class, EventKey.class, Text.class);
5254
JavaRDD<String> words = lines.map(x -> x._2).flatMap(s -> Arrays.asList(SPACE.split(s.toString())).iterator());

pravega-client-examples/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ dependencies {
3333

3434
compile "org.slf4j:slf4j-api:1.7.14"
3535
compile "ch.qos.logback:logback-classic:1.1.7"
36+
37+
if (includePravegaCredentials.toBoolean()) {
38+
compile "io.pravega:pravega-keycloak-credentials:${pravegaCredentialsVersion}"
39+
}
3640
}
3741

3842
// Build examples

scenarios/anomaly-detection/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ dependencies {
2727
compile "org.apache.flink:flink-streaming-java_2.11:${flinkVersion}"
2828
compile "org.apache.flink:flink-connector-elasticsearch5_2.11:${flinkVersion}"
2929
compile "ch.qos.logback:logback-classic:1.1.7"
30+
if (includePravegaCredentials.toBoolean()) {
31+
compile "io.pravega:pravega-keycloak-credentials:${pravegaCredentialsVersion}"
32+
}
3033
}
3134

3235
shadowJar {

scenarios/pravega-flink-connector-sql-samples/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ dependencies {
3232

3333
compile "joda-time:joda-time:2.7"
3434
compile "org.projectlombok:lombok:1.16.18"
35+
36+
if (includePravegaCredentials.toBoolean()) {
37+
compile "io.pravega:pravega-keycloak-credentials:${pravegaCredentialsVersion}"
38+
}
3539
}
3640

3741
task scriptConnectorTableApiSamples(type: CreateStartScripts) {

scenarios/turbine-heat-processor/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ dependencies {
3131
compile "org.apache.flink:flink-streaming-java_2.11:${flinkVersion}"
3232
compile "org.apache.flink:flink-streaming-scala_2.11:${flinkVersion}"
3333
compile "org.slf4j:slf4j-log4j12:1.7.14"
34+
if (includePravegaCredentials.toBoolean()) {
35+
compile "io.pravega:pravega-keycloak-credentials:${pravegaCredentialsVersion}"
36+
}
3437
}
3538

3639
shadowJar {

scenarios/turbine-heat-sensor/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ dependencies {
3333

3434
compile "org.slf4j:slf4j-api:1.7.14"
3535
compile "ch.qos.logback:logback-classic:1.1.7"
36+
37+
if (includePravegaCredentials.toBoolean()) {
38+
compile "io.pravega:pravega-keycloak-credentials:${pravegaCredentialsVersion}"
39+
}
3640
}
3741

3842
task scriptTurbineSensor(type: CreateStartScripts) {

0 commit comments

Comments
 (0)