Repository: incubator-samza Updated Branches: refs/heads/master 747406eb4 -> 49571fc98
SAMZA-430; update BeanProperty package space Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/49571fc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/49571fc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/49571fc9 Branch: refs/heads/master Commit: 49571fc9898271a4f175bce3089da31f50d16f48 Parents: 747406e Author: Yi Pan <[email protected]> Authored: Tue Nov 18 08:32:19 2014 -0800 Committer: Chris Riccomini <[email protected]> Committed: Tue Nov 18 08:32:19 2014 -0800 ---------------------------------------------------------------------- .travis.yml | 7 ------ README.md | 4 ++-- RELEASE.md | 4 ++-- bin/check-all.sh | 5 ++-- .../versioned/remote-debugging-samza.md | 2 +- gradle/dependency-versions-scala-2.9.2.gradle | 25 -------------------- .../samza/metrics/reporter/MetricsHeader.scala | 2 +- .../metrics/reporter/MetricsSnapshot.scala | 2 +- 8 files changed, 10 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/49571fc9/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 4728464..46a5a19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,17 +24,10 @@ jdk: env: matrix: - - SCALA_VERSION='-PscalaVersion=2.9.2' YARN_VERSION='-PyarnVersion=2.4.0' - SCALA_VERSION='-PscalaVersion=2.10' YARN_VERSION='-PyarnVersion=2.4.0' - - SCALA_VERSION='-PscalaVersion=2.9.2' YARN_VERSION='-PyarnVersion=2.5.0' - SCALA_VERSION='-PscalaVersion=2.10' YARN_VERSION='-PyarnVersion=2.5.0' matrix: - exclude: - - env: SCALA_VERSION='-PscalaVersion=2.9.2' YARN_VERSION='-PyarnVersion=2.4.0' - jdk: oraclejdk8 - - env: SCALA_VERSION='-PscalaVersion=2.9.2' YARN_VERSION='-PyarnVersion=2.5.0' - jdk: oraclejdk8 script: ./gradlew $SCALA_VERSION $YARN_VERSION --stacktrace check http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/49571fc9/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index fc30a3a..4453984 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 and [YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) 2.2.0, by default. Use the -PscalaVersion switches to change Scala versions. Samza supports building Scala with 2.9.2, or 2.10. +Samza builds with [Scala](http://www.scala-lang.org/) 2.10 and [YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) 2.4.0, by default. Use the -PscalaVersion switches to change Scala versions. Samza supports building Scala with 2.10. - ./gradlew -PscalaVersion=2.9.2 clean build + ./gradlew -PscalaVersion=2.10 clean build ### Testing Samza http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/49571fc9/RELEASE.md ---------------------------------------------------------------------- diff --git a/RELEASE.md b/RELEASE.md index b2a6bb6..13af09f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -9,7 +9,7 @@ Auto-generate all missing headers in files: To release to a local Maven repository: ./gradlew clean publishToMavenLocal - ./gradlew -PscalaVersion=2.9.2 clean publishToMavenLocal + ./gradlew -PscalaVersion=2.10 clean publishToMavenLocal To build a tarball suitable for an ASF source release (and its accompanying MD5 file): @@ -54,7 +54,7 @@ Build binary artifacts and upload them to the staging repository: # If it's built with Java 8, the classes won't be readable by Java 7. export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home ./gradlew clean uploadArchives - ./gradlew -PscalaVersion=2.9.2 clean uploadArchives + ./gradlew -PscalaVersion=2.10 clean uploadArchives Go to [repository web interface](https://repository.apache.org/), log in with Apache LDAP credentials, go to "Staging Repositories", select the org.apache.samza http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/49571fc9/bin/check-all.sh ---------------------------------------------------------------------- diff --git a/bin/check-all.sh b/bin/check-all.sh index 37f6684..05f00de 100755 --- a/bin/check-all.sh +++ b/bin/check-all.sh @@ -21,7 +21,7 @@ set -e -SCALAs=( "2.9.2" "2.10" ) +SCALAs=( "2.10" ) JDKs=( "JAVA6_HOME" "JAVA7_HOME" "JAVA8_HOME" ) YARNs=( "2.4.0" "2.5.0" ) @@ -62,8 +62,9 @@ do for scala_version in "${SCALAs[@]}" do jdk_number=${i:4:1} + # skip because Scala 2.9.2 doesn't work with JDK8 - if [[ "$jdk_number" != "8" ]] || [[ "$scala_version" != "2.9.2" ]]; then + if [[ "$jdk_number" != "8" ]]; then for yarn_version in "${YARNs[@]}" do echo "------------- Running check task against JDK${jdk_number}/Scala ${scala_version}/YARN ${yarn_version}" http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/49571fc9/docs/learn/tutorials/versioned/remote-debugging-samza.md ---------------------------------------------------------------------- diff --git a/docs/learn/tutorials/versioned/remote-debugging-samza.md b/docs/learn/tutorials/versioned/remote-debugging-samza.md index 3b16e9e..2bcba2f 100644 --- a/docs/learn/tutorials/versioned/remote-debugging-samza.md +++ b/docs/learn/tutorials/versioned/remote-debugging-samza.md @@ -47,7 +47,7 @@ cd incubator-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.9.2 clean publishToMavenLocal +./gradlew -PscalaVersion=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 'incubator-samza' folder, and hit 'finish'. http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/49571fc9/gradle/dependency-versions-scala-2.9.2.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions-scala-2.9.2.gradle b/gradle/dependency-versions-scala-2.9.2.gradle deleted file mode 100644 index 8e75bac..0000000 --- a/gradle/dependency-versions-scala-2.9.2.gradle +++ /dev/null @@ -1,25 +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.9.2" - scalaLibVersion = "2.9.2" - scalaOptions = "" - scalatraVersion = "2.2.1" - jettyVersion = "8.1.8.v20121106" -} http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/49571fc9/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsHeader.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsHeader.scala b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsHeader.scala index 369c718..8359b17 100644 --- a/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsHeader.scala +++ b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsHeader.scala @@ -21,7 +21,7 @@ package org.apache.samza.metrics.reporter import java.util.HashMap import java.util.Map -import scala.reflect.BeanProperty +import scala.beans.BeanProperty object MetricsHeader { def fromMap(map: Map[String, Object]): MetricsHeader = { http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/49571fc9/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshot.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshot.scala b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshot.scala index da775f7..ad08eb7 100644 --- a/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshot.scala +++ b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshot.scala @@ -21,7 +21,7 @@ package org.apache.samza.metrics.reporter import java.util.Map import java.util.HashMap -import scala.reflect.BeanProperty +import scala.beans.BeanProperty object MetricsSnapshot { def fromMap(map: Map[String, Map[String, Object]]) = {
