You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by pm...@apache.org on 2019/02/26 01:33:07 UTC
[samza] branch master updated: [CLEANUP] Rename scalaVersion to
scalaSuffix and scalaLibVersion to scalaVersion
This is an automated email from the ASF dual-hosted git repository.
pmaheshwari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/samza.git
The following commit(s) were added to refs/heads/master by this push:
new 725e973 [CLEANUP] Rename scalaVersion to scalaSuffix and scalaLibVersion to scalaVersion
725e973 is described below
commit 725e973905e7936c1ae0ead66f975123496c4b16
Author: mynameborat <bh...@gmail.com>
AuthorDate: Mon Feb 25 17:33:03 2019 -0800
[CLEANUP] Rename scalaVersion to scalaSuffix and scalaLibVersion to scalaVersion
Currently we have scala suffix being interchangeably used for `scalaVersion` and `scalaLibVersion` for scala version.
Author: mynameborat <bh...@gmail.com>
Reviewers: Prateek Maheshwari <pm...@apache.org>
Closes #929 from mynameborat/scala-cleanup
---
README.md | 4 +-
RELEASE.md | 2 +-
bin/check-all.sh | 2 +-
build.gradle | 174 ++++++++++-----------
docs/contribute/tests.md | 2 +-
.../tutorials/versioned/remote-debugging-samza.md | 2 +-
gradle.properties | 2 +-
gradle/dependency-versions-scala-2.10.gradle | 29 ----
gradle/dependency-versions-scala-2.11.gradle | 4 +-
gradle/dependency-versions-scala-2.12.gradle | 4 +-
settings.gradle | 2 +-
11 files changed, 99 insertions(+), 128 deletions(-)
diff --git a/README.md b/README.md
index 1a7fdd9..d0a4ec8 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,9 @@ After the bootstrap script has completed, the regular gradlew instructions below
#### Scala and YARN
-Samza builds with [Scala](http://www.scala-lang.org/) 2.10 or 2.11 and [YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) 2.6.1, by default. Use the -PscalaVersion switches to change Scala versions. Samza supports building Scala with 2.10 and 2.11.
+Samza builds with [Scala](http://www.scala-lang.org/) 2.10 or 2.11 and [YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) 2.6.1, by default. Use the -PscalaSuffix switches to change Scala versions. Samza supports building Scala with 2.10 and 2.11.
- ./gradlew -PscalaVersion=2.11 clean build
+ ./gradlew -PscalaSuffix=2.11 clean build
### Testing Samza
diff --git a/RELEASE.md b/RELEASE.md
index 2bc731b..ff90748 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -121,7 +121,7 @@ the org.apache.samza repository listed under "Staging Repositories".
The instructions above publish the Samza artifacts for scala 2.11. To publish for scala 2.10 and 2.12:
-* Set the desired `scalaVersion` in `gradle.properties`.
+* Set the desired `scalaSuffix` in `gradle.properties`.
* Run `./gradlew clean uploadArchives` to generate and upload the Samza artifacts.
* Login to the [repository web interface](https://repository.apache.org/) with your Apache LDAP
credentials, "close" the created repository and "release" it.
diff --git a/bin/check-all.sh b/bin/check-all.sh
index f168bc8..b0fe75b 100755
--- a/bin/check-all.sh
+++ b/bin/check-all.sh
@@ -81,7 +81,7 @@ do
for yarn_version in "${YARNs[@]}"
do
echo "------------- Running check task against JDK${jdk_number}/Scala ${scala_version}/YARN ${yarn_version}"
- ${gradle_file} -PscalaVersion=${scala_version} -PyarnVersion=${yarn_version} -Dorg.gradle.java.home=${!i} clean check $@
+ ${gradle_file} -PscalaSuffix=${scala_version} -PyarnVersion=${yarn_version} -Dorg.gradle.java.home=${!i} clean check $@
echo "------------- Finished running check task against JDK${jdk_number}/Scala ${scala_version}/YARN ${yarn_version}"
done
done
diff --git a/build.gradle b/build.gradle
index 53b01dc..4b61890 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ allprojects {
}
apply from: file("gradle/dependency-versions.gradle")
-apply from: file("gradle/dependency-versions-scala-" + scalaVersion + ".gradle")
+apply from: file("gradle/dependency-versions-scala-" + scalaSuffix + ".gradle")
apply from: file("gradle/release.gradle")
apply from: file("gradle/rat.gradle")
apply from: file('gradle/customize.gradle')
@@ -155,7 +155,7 @@ project(':samza-api') {
}
}
-project(":samza-core_$scalaVersion") {
+project(":samza-core_$scalaSuffix") {
apply plugin: 'scala'
apply plugin: 'checkstyle'
@@ -185,7 +185,7 @@ project(":samza-core_$scalaVersion") {
compile "org.apache.commons:commons-lang3:$commonsLang3Version"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "org.eclipse.jetty:jetty-webapp:$jettyVersion"
- compile "org.scala-lang:scala-library:$scalaLibVersion"
+ compile "org.scala-lang:scala-library:$scalaVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "net.jodah:failsafe:$failsafeVersion"
testCompile project(":samza-api").sourceSets.test.output
@@ -194,7 +194,7 @@ project(":samza-core_$scalaVersion") {
testCompile "org.powermock:powermock-api-mockito:$powerMockVersion"
testCompile "org.powermock:powermock-core:$powerMockVersion"
testCompile "org.powermock:powermock-module-junit4:$powerMockVersion"
- testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
+ testCompile "org.scalatest:scalatest_$scalaSuffix:$scalaTestVersion"
testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion"
}
@@ -204,7 +204,7 @@ project(":samza-core_$scalaVersion") {
}
}
-project(":samza-azure_$scalaVersion") {
+project(":samza-azure_$scalaSuffix") {
apply plugin: 'java'
apply plugin: 'checkstyle'
@@ -214,7 +214,7 @@ project(":samza-azure_$scalaVersion") {
compile "com.fasterxml.jackson.core:jackson-core:2.8.8"
compile "io.dropwizard.metrics:metrics-core:3.1.2"
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
+ compile project(":samza-core_$scalaSuffix")
compile "org.slf4j:slf4j-api:$slf4jVersion"
testCompile "junit:junit:$junitVersion"
testCompile "org.mockito:mockito-core:$mockitoVersion"
@@ -228,7 +228,7 @@ project(":samza-azure_$scalaVersion") {
}
}
-project(":samza-aws_$scalaVersion") {
+project(":samza-aws_$scalaSuffix") {
apply plugin: 'java'
apply plugin: 'checkstyle'
@@ -240,7 +240,7 @@ project(":samza-aws_$scalaVersion") {
compile "org.codehaus.jackson:jackson-core-asl:1.9.7"
compile "org.codehaus.jackson:jackson-mapper-asl:1.9.7"
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
+ compile project(":samza-core_$scalaSuffix")
compile "org.slf4j:slf4j-api:$slf4jVersion"
runtime "org.apache.httpcomponents:httpclient:4.5.2"
testCompile "junit:junit:$junitVersion"
@@ -260,7 +260,7 @@ project(":samza-aws_$scalaVersion") {
}
-project(":samza-autoscaling_$scalaVersion") {
+project(":samza-autoscaling_$scalaSuffix") {
apply plugin: 'scala'
apply plugin: 'checkstyle'
@@ -275,8 +275,8 @@ project(":samza-autoscaling_$scalaVersion") {
dependencies {
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
- compile "org.scala-lang:scala-library:$scalaLibVersion"
+ compile project(":samza-core_$scalaSuffix")
+ compile "org.scala-lang:scala-library:$scalaVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "net.sf.jopt-simple:jopt-simple:$joptSimpleVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
@@ -290,7 +290,7 @@ project(":samza-autoscaling_$scalaVersion") {
compile "org.apache.httpcomponents:httpclient:$httpClientVersion"
testCompile "junit:junit:$junitVersion"
testCompile "org.mockito:mockito-core:$mockitoVersion"
- testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
+ testCompile "org.scalatest:scalatest_$scalaSuffix:$scalaTestVersion"
}
checkstyle {
@@ -299,12 +299,12 @@ project(":samza-autoscaling_$scalaVersion") {
}
}
-project(":samza-elasticsearch_$scalaVersion") {
+project(":samza-elasticsearch_$scalaSuffix") {
apply plugin: 'java'
dependencies {
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
+ compile project(":samza-core_$scalaSuffix")
compile "org.elasticsearch:elasticsearch:$elasticsearchVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
@@ -315,7 +315,7 @@ project(":samza-elasticsearch_$scalaVersion") {
}
}
-project(":samza-sql_$scalaVersion") {
+project(":samza-sql_$scalaSuffix") {
apply plugin: 'java'
// Disabling assertions while running test because of a calcite bug in {@link RelOptUtil#eq} method
@@ -326,9 +326,9 @@ project(":samza-sql_$scalaVersion") {
dependencies {
compile project(':samza-api')
- compile project(":samza-kafka_$scalaVersion")
- compile project(":samza-kv-inmemory_$scalaVersion")
- compile project(":samza-kv-rocksdb_$scalaVersion")
+ compile project(":samza-kafka_$scalaSuffix")
+ compile project(":samza-kv-inmemory_$scalaSuffix")
+ compile project(":samza-kv-rocksdb_$scalaSuffix")
compile "org.apache.avro:avro:$avroVersion"
compile "org.apache.calcite:calcite-core:$calciteVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
@@ -343,7 +343,7 @@ project(":samza-sql_$scalaVersion") {
}
}
-project(":samza-sql-shell_$scalaVersion") {
+project(":samza-sql-shell_$scalaSuffix") {
apply plugin: 'java'
jar {
@@ -353,12 +353,12 @@ project(":samza-sql-shell_$scalaVersion") {
}
dependencies {
- compile project(":samza-sql_$scalaVersion")
- compile project(":samza-tools_$scalaVersion")
- compile project(":samza-core_$scalaVersion")
+ compile project(":samza-sql_$scalaSuffix")
+ compile project(":samza-tools_$scalaSuffix")
+ compile project(":samza-core_$scalaSuffix")
compile project(':samza-api')
- compile project(":samza-kafka_$scalaVersion")
- compile project(":samza-azure_$scalaVersion")
+ compile project(":samza-kafka_$scalaSuffix")
+ compile project(":samza-azure_$scalaSuffix")
compile "net.java.dev.jna:jna:$jnaVersion"
compile "org.jline:jline:$jlineVersion"
@@ -377,13 +377,13 @@ project(":samza-sql-shell_$scalaVersion") {
}
}
-project(":samza-tools_$scalaVersion") {
+project(":samza-tools_$scalaSuffix") {
apply plugin: 'java'
dependencies {
- compile project(":samza-sql_$scalaVersion")
+ compile project(":samza-sql_$scalaSuffix")
compile project(':samza-api')
- compile project(":samza-azure_$scalaVersion")
+ compile project(":samza-azure_$scalaSuffix")
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "commons-cli:commons-cli:$commonsCliVersion"
compile "org.apache.avro:avro:$avroVersion"
@@ -403,7 +403,7 @@ project(":samza-tools_$scalaVersion") {
}
}
-project(":samza-kafka_$scalaVersion") {
+project(":samza-kafka_$scalaSuffix") {
apply plugin: 'scala'
// Force scala joint compilation
@@ -424,19 +424,19 @@ project(":samza-kafka_$scalaVersion") {
dependencies {
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
- compile "org.scala-lang:scala-library:$scalaLibVersion"
+ compile project(":samza-core_$scalaSuffix")
+ compile "org.scala-lang:scala-library:$scalaVersion"
compile "com.101tec:zkclient:$zkClientVersion"
compile "org.apache.zookeeper:zookeeper:$zookeeperVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
- compile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion"
+ compile "org.apache.kafka:kafka_$scalaSuffix:$kafkaVersion"
compile "org.apache.kafka:kafka-clients:$kafkaVersion"
- testCompile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion:test"
+ testCompile "org.apache.kafka:kafka_$scalaSuffix:$kafkaVersion:test"
testCompile "org.apache.kafka:kafka-clients:$kafkaVersion:test"
testCompile "junit:junit:$junitVersion"
testCompile "org.mockito:mockito-core:$mockitoVersion"
- testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
- testCompile project(":samza-core_$scalaVersion").sourceSets.test.output
+ testCompile "org.scalatest:scalatest_$scalaSuffix:$scalaTestVersion"
+ testCompile project(":samza-core_$scalaSuffix").sourceSets.test.output
// Logging in tests is good.
testRuntime "org.slf4j:slf4j-simple:$slf4jVersion"
@@ -455,7 +455,7 @@ project(":samza-kafka_$scalaVersion") {
}
}
-project(":samza-log4j_$scalaVersion") {
+project(":samza-log4j_$scalaSuffix") {
apply plugin: 'java'
apply plugin: 'checkstyle'
@@ -463,7 +463,7 @@ project(":samza-log4j_$scalaVersion") {
compile "log4j:log4j:$log4jVersion"
compile "org.slf4j:slf4j-log4j12:$slf4jVersion"
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
+ compile project(":samza-core_$scalaSuffix")
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
testCompile "junit:junit:$junitVersion"
}
@@ -474,7 +474,7 @@ project(":samza-log4j_$scalaVersion") {
}
}
-project(":samza-log4j2_$scalaVersion") {
+project(":samza-log4j2_$scalaSuffix") {
apply plugin: 'java'
apply plugin: 'checkstyle'
@@ -484,7 +484,7 @@ project(":samza-log4j2_$scalaVersion") {
compile "org.apache.logging.log4j:log4j-core:$log4j2Version"
compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j2Version"
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
+ compile project(":samza-core_$scalaSuffix")
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
testCompile "junit:junit:$junitVersion"
}
@@ -495,7 +495,7 @@ project(":samza-log4j2_$scalaVersion") {
}
}
-project(":samza-yarn_$scalaVersion") {
+project(":samza-yarn_$scalaSuffix") {
apply plugin: 'scala'
apply plugin: 'lesscss'
@@ -510,9 +510,9 @@ project(":samza-yarn_$scalaVersion") {
dependencies {
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
- compile "org.scala-lang:scala-library:$scalaLibVersion"
- compile "org.scala-lang:scala-compiler:$scalaLibVersion"
+ compile project(":samza-core_$scalaSuffix")
+ compile "org.scala-lang:scala-library:$scalaVersion"
+ compile "org.scala-lang:scala-compiler:$scalaVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "commons-httpclient:commons-httpclient:$commonsHttpClientVersion"
compile "org.apache.httpcomponents:httpclient:$httpClientVersion"
@@ -532,11 +532,11 @@ project(":samza-yarn_$scalaVersion") {
compile("org.apache.hadoop:hadoop-hdfs:$yarnVersion") {
exclude module: 'servlet-api'
}
- compile("org.scalatra:scalatra_$scalaVersion:$scalatraVersion") {
+ compile("org.scalatra:scalatra_$scalaSuffix:$scalatraVersion") {
exclude module: 'scala-compiler'
exclude module: 'slf4j-api'
}
- compile("org.scalatra:scalatra-scalate_$scalaVersion:$scalatraVersion") {
+ compile("org.scalatra:scalatra-scalate_$scalaSuffix:$scalatraVersion") {
exclude module: 'scala-compiler'
exclude module: 'slf4j-api'
}
@@ -544,8 +544,8 @@ project(":samza-yarn_$scalaVersion") {
compile "org.apache.zookeeper:zookeeper:$zookeeperVersion"
testCompile "junit:junit:$junitVersion"
testCompile "org.mockito:mockito-core:$mockitoVersion"
- testCompile project(":samza-core_$scalaVersion").sourceSets.test.output
- testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
+ testCompile project(":samza-core_$scalaSuffix").sourceSets.test.output
+ testCompile "org.scalatest:scalatest_$scalaSuffix:$scalaTestVersion"
}
repositories {
@@ -572,10 +572,10 @@ project(":samza-shell") {
}
dependencies {
- gradleShell project(":samza-core_$scalaVersion")
- gradleShell project(":samza-kafka_$scalaVersion")
- gradleShell project(":samza-test_$scalaVersion")
- gradleShell project(":samza-yarn_$scalaVersion")
+ gradleShell project(":samza-core_$scalaSuffix")
+ gradleShell project(":samza-kafka_$scalaSuffix")
+ gradleShell project(":samza-test_$scalaSuffix")
+ gradleShell project(":samza-yarn_$scalaSuffix")
}
task shellTarGz(type: Tar) {
@@ -625,7 +625,7 @@ project(":samza-shell") {
}
}
-project(":samza-kv_$scalaVersion") {
+project(":samza-kv_$scalaSuffix") {
apply plugin: 'scala'
apply plugin: 'checkstyle'
@@ -641,8 +641,8 @@ project(":samza-kv_$scalaVersion") {
dependencies {
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
- compile "org.scala-lang:scala-library:$scalaLibVersion"
+ compile project(":samza-core_$scalaSuffix")
+ compile "org.scala-lang:scala-library:$scalaVersion"
testCompile "junit:junit:$junitVersion"
testCompile "org.mockito:mockito-core:$mockitoVersion"
}
@@ -653,7 +653,7 @@ project(":samza-kv_$scalaVersion") {
}
}
-project(":samza-kv-inmemory_$scalaVersion") {
+project(":samza-kv-inmemory_$scalaSuffix") {
apply plugin: 'scala'
// Force scala joint compilation
@@ -667,15 +667,15 @@ project(":samza-kv-inmemory_$scalaVersion") {
dependencies {
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
- compile project(":samza-kv_$scalaVersion")
- compile "org.scala-lang:scala-library:$scalaLibVersion"
+ compile project(":samza-core_$scalaSuffix")
+ compile project(":samza-kv_$scalaSuffix")
+ compile "org.scala-lang:scala-library:$scalaVersion"
compile "com.google.guava:guava:$guavaVersion"
testCompile "junit:junit:$junitVersion"
}
}
-project(":samza-kv-rocksdb_$scalaVersion") {
+project(":samza-kv-rocksdb_$scalaSuffix") {
apply plugin: 'scala'
// Force scala joint compilation
@@ -689,16 +689,16 @@ project(":samza-kv-rocksdb_$scalaVersion") {
dependencies {
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
- compile project(":samza-kv_$scalaVersion")
- compile "org.scala-lang:scala-library:$scalaLibVersion"
+ compile project(":samza-core_$scalaSuffix")
+ compile project(":samza-kv_$scalaSuffix")
+ compile "org.scala-lang:scala-library:$scalaVersion"
compile "org.rocksdb:rocksdbjni:$rocksdbVersion"
testCompile "junit:junit:$junitVersion"
- testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
+ testCompile "org.scalatest:scalatest_$scalaSuffix:$scalaTestVersion"
}
}
-project(":samza-hdfs_$scalaVersion") {
+project(":samza-hdfs_$scalaSuffix") {
apply plugin: 'scala'
// Force scala joint compilation
@@ -708,12 +708,12 @@ project(":samza-hdfs_$scalaVersion") {
dependencies {
compile project(':samza-api')
- compile project(":samza-core_$scalaVersion")
+ compile project(":samza-core_$scalaSuffix")
// currently hdfs system producer/consumer do depend on yarn for two things:
// 1. staging directory 2. security
// SAMZA-1032 to solve the staging directory dependency
- compile project(":samza-yarn_$scalaVersion")
- compile "org.scala-lang:scala-library:$scalaLibVersion"
+ compile project(":samza-yarn_$scalaSuffix")
+ compile "org.scala-lang:scala-library:$scalaVersion"
compile("org.apache.hadoop:hadoop-hdfs:$yarnVersion") {
exclude module: 'servlet-api'
}
@@ -723,17 +723,17 @@ project(":samza-hdfs_$scalaVersion") {
}
testCompile "junit:junit:$junitVersion"
- testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
+ testCompile "org.scalatest:scalatest_$scalaSuffix:$scalaTestVersion"
testCompile "org.apache.hadoop:hadoop-minicluster:$yarnVersion"
}
}
-project(":samza-rest_$scalaVersion") {
+project(":samza-rest_$scalaSuffix") {
apply plugin: 'java'
dependencies {
compile project(":samza-shell")
- compile project(":samza-core_$scalaVersion")
+ compile project(":samza-core_$scalaSuffix")
runtime "org.slf4j:slf4j-log4j12:$slf4jVersion"
compile "com.google.guava:guava:$guavaVersion"
@@ -786,7 +786,7 @@ project(":samza-rest_$scalaVersion") {
}
}
-project(":samza-test_$scalaVersion") {
+project(":samza-test_$scalaSuffix") {
apply plugin: 'scala'
apply plugin: 'checkstyle'
@@ -814,29 +814,29 @@ project(":samza-test_$scalaVersion") {
dependencies {
compile project(':samza-api')
- compile project(":samza-kv-inmemory_$scalaVersion")
- compile project(":samza-kv-rocksdb_$scalaVersion")
- compile project(":samza-core_$scalaVersion")
- compile project(":samza-kafka_$scalaVersion")
- compile project(":samza-sql_$scalaVersion")
- runtime project(":samza-log4j_$scalaVersion")
- runtime project(":samza-log4j2_$scalaVersion")
- runtime project(":samza-yarn_$scalaVersion")
- runtime project(":samza-hdfs_$scalaVersion")
- compile "org.scala-lang:scala-library:$scalaLibVersion"
+ compile project(":samza-kv-inmemory_$scalaSuffix")
+ compile project(":samza-kv-rocksdb_$scalaSuffix")
+ compile project(":samza-core_$scalaSuffix")
+ compile project(":samza-kafka_$scalaSuffix")
+ compile project(":samza-sql_$scalaSuffix")
+ runtime project(":samza-log4j_$scalaSuffix")
+ runtime project(":samza-log4j2_$scalaSuffix")
+ runtime project(":samza-yarn_$scalaSuffix")
+ runtime project(":samza-hdfs_$scalaSuffix")
+ compile "org.scala-lang:scala-library:$scalaVersion"
compile "net.sf.jopt-simple:jopt-simple:$joptSimpleVersion"
compile "javax.mail:mail:1.4"
- compile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion"
+ compile "org.apache.kafka:kafka_$scalaSuffix:$kafkaVersion"
compile "junit:junit:$junitVersion"
compile "org.hamcrest:hamcrest-all:$hamcrestVersion"
- testCompile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion:test"
+ testCompile "org.apache.kafka:kafka_$scalaSuffix:$kafkaVersion:test"
testCompile "com.101tec:zkclient:$zkClientVersion"
- testCompile project(":samza-kafka_$scalaVersion")
- testCompile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion:test"
+ testCompile project(":samza-kafka_$scalaSuffix")
+ testCompile "org.apache.kafka:kafka_$scalaSuffix:$kafkaVersion:test"
testCompile "org.apache.kafka:kafka-clients:$kafkaVersion:test"
- testCompile project(":samza-core_$scalaVersion").sourceSets.test.output
- testCompile project(":samza-sql_$scalaVersion").sourceSets.test.output
- testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
+ testCompile project(":samza-core_$scalaSuffix").sourceSets.test.output
+ testCompile project(":samza-sql_$scalaSuffix").sourceSets.test.output
+ testCompile "org.scalatest:scalatest_$scalaSuffix:$scalaTestVersion"
testCompile "org.mockito:mockito-core:$mockitoVersion"
testRuntime "org.slf4j:slf4j-simple:$slf4jVersion"
}
diff --git a/docs/contribute/tests.md b/docs/contribute/tests.md
index 9fe728c..6b724bd 100644
--- a/docs/contribute/tests.md
+++ b/docs/contribute/tests.md
@@ -41,7 +41,7 @@ Samza's unit tests can also be run against all supported permutations of Scala a
To run the tests against a specific combination:
- ./gradlew -PscalaVersion=2.10 -PyarnVersion=2.4.0 clean check
+ ./gradlew -PscalaSuffix=2.10 -PyarnVersion=2.4.0 clean check
To run Samza's unit tests against all permutations, run:
diff --git a/docs/learn/tutorials/versioned/remote-debugging-samza.md b/docs/learn/tutorials/versioned/remote-debugging-samza.md
index 2a59496..5486148 100644
--- a/docs/learn/tutorials/versioned/remote-debugging-samza.md
+++ b/docs/learn/tutorials/versioned/remote-debugging-samza.md
@@ -47,7 +47,7 @@ cd samza
Let's also release Samza to Maven's local repository, so hello-samza has access to the JARs that it needs.
{% highlight bash %}
-./gradlew -PscalaVersion=2.10 clean publishToMavenLocal
+./gradlew -PscalaSuffix=2.10 clean publishToMavenLocal
{% endhighlight %}
Next, open Eclipse, and import the Samza source code into your workspace: "File" > "Import" > "Existing Projects into Workspace" > "Browse". Select 'samza' folder, and hit 'finish'.
diff --git a/gradle.properties b/gradle.properties
index b69f9ba..7f83ef5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@
# under the License.
group=org.apache.samza
version=1.0.1-SNAPSHOT
-scalaVersion=2.11
+scalaSuffix=2.11
gradleVersion=2.8
diff --git a/gradle/dependency-versions-scala-2.10.gradle b/gradle/dependency-versions-scala-2.10.gradle
deleted file mode 100644
index f42775f..0000000
--- a/gradle/dependency-versions-scala-2.10.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-ext {
- scalaVersion = "2.10"
- scalaLibVersion = "2.10.4"
- // Extra options for the compiler:
- // -feature: Give detailed warnings about language feature use (rather than just 'there were 4 warnings')
- // -language:implicitConversions: Allow the use of implicit conversions without warning or library import
- // -language:reflectiveCalls: Allow the automatic use of reflection to access fields without warning or library import
- scalaOptions = ["-feature", "-language:implicitConversions", "-language:reflectiveCalls"]
- scalatraVersion = "2.2.1"
- jettyVersion = "9.2.7.v20150116"
-}
diff --git a/gradle/dependency-versions-scala-2.11.gradle b/gradle/dependency-versions-scala-2.11.gradle
index 2fbb22b..1f777a1 100644
--- a/gradle/dependency-versions-scala-2.11.gradle
+++ b/gradle/dependency-versions-scala-2.11.gradle
@@ -17,8 +17,8 @@
* under the License.
*/
ext {
- scalaVersion = "2.11"
- scalaLibVersion = "2.11.8"
+ scalaSuffix = "2.11"
+ scalaVersion = "2.11.8"
// Extra options for the compiler:
// -feature: Give detailed warnings about language feature use (rather than just 'there were 4 warnings')
// -language:implicitConversions: Allow the use of implicit conversions without warning or library import
diff --git a/gradle/dependency-versions-scala-2.12.gradle b/gradle/dependency-versions-scala-2.12.gradle
index 3c8e93d..b949fbc 100644
--- a/gradle/dependency-versions-scala-2.12.gradle
+++ b/gradle/dependency-versions-scala-2.12.gradle
@@ -17,8 +17,8 @@
* under the License.
*/
ext {
- scalaVersion = "2.12"
- scalaLibVersion = "2.12.1"
+ scalaSuffix = "2.12"
+ scalaVersion = "2.12.1"
// Extra options for the compiler:
// -feature: Give detailed warnings about language feature use (rather than just 'there were 4 warnings')
// -language:implicitConversions: Allow the use of implicit conversions without warning or library import
diff --git a/settings.gradle b/settings.gradle
index 98f9a4c..6a75cbb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -49,7 +49,7 @@ scalaModules.each {
rootProject.children.each {
if (scalaModules.contains(it.name)) {
- it.name = it.name + "_" + scalaVersion
+ it.name = it.name + "_" + scalaSuffix
}
}