Fixing merging issues to make samza-sql build
Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/fb4f12ed Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/fb4f12ed Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/fb4f12ed Branch: refs/heads/samza-sql Commit: fb4f12ed36030efb7f489e6f796e4dde2ae13a3d Parents: 3415909 Author: Yi Pan (Data Infrastructure) <[email protected]> Authored: Mon Feb 1 16:31:26 2016 -0800 Committer: Yi Pan (Data Infrastructure) <[email protected]> Committed: Mon Feb 1 16:31:26 2016 -0800 ---------------------------------------------------------------------- build.gradle | 6 +++--- samza-sql-core/README.md | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/fb4f12ed/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index f3e5875..5894e9d 100644 --- a/build.gradle +++ b/build.gradle @@ -334,7 +334,7 @@ project(":samza-yarn_$scalaVersion") { jar.dependsOn("lesscss") } -project(":samza-sql-core_$scalaVersion") { +project(":samza-sql-core") { apply plugin: 'java' dependencies { @@ -348,11 +348,11 @@ project(":samza-sql-core_$scalaVersion") { } } -project(":samza-sql-calcite_$scalaVersion") { +project(":samza-sql-calcite") { apply plugin: 'java' dependencies { - compile project(":samza-sql-core_$scalaVersion") + compile project(":samza-sql-core") compile "org.apache.calcite:calcite-core:$calciteVersion" testCompile "junit:junit:$junitVersion" testCompile "org.mockito:mockito-all:$mockitoVersion" http://git-wip-us.apache.org/repos/asf/samza/blob/fb4f12ed/samza-sql-core/README.md ---------------------------------------------------------------------- diff --git a/samza-sql-core/README.md b/samza-sql-core/README.md index 598670b..72464dc 100644 --- a/samza-sql-core/README.md +++ b/samza-sql-core/README.md @@ -1 +1,17 @@ +<!-- + 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. +--> samza-sql is an experimental module that is under development (SAMZA-390).
