You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2016/08/02 10:43:55 UTC
[3/7] flink git commit: [FLINK-4292] [batch connectors] Fix setup of
HCatalog project by adding Scala SDK dependency
[FLINK-4292] [batch connectors] Fix setup of HCatalog project by adding Scala SDK dependency
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/70a0479c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/70a0479c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/70a0479c
Branch: refs/heads/release-1.1
Commit: 70a0479c0a1469c6c69c3c1112946f7ae32632ca
Parents: 7b6ed59
Author: Stephan Ewen <se...@apache.org>
Authored: Mon Aug 1 12:03:33 2016 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Mon Aug 1 20:07:33 2016 +0200
----------------------------------------------------------------------
flink-batch-connectors/flink-hcatalog/pom.xml | 7 ++++++-
.../org/apache/flink/hcatalog/scala/HCatInputFormat.scala | 2 +-
flink-streaming-scala/pom.xml | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/70a0479c/flink-batch-connectors/flink-hcatalog/pom.xml
----------------------------------------------------------------------
diff --git a/flink-batch-connectors/flink-hcatalog/pom.xml b/flink-batch-connectors/flink-hcatalog/pom.xml
index f79431d..f23ad12 100644
--- a/flink-batch-connectors/flink-hcatalog/pom.xml
+++ b/flink-batch-connectors/flink-hcatalog/pom.xml
@@ -48,6 +48,12 @@ under the License.
<version>0.12.0</version>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -56,7 +62,6 @@ under the License.
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
- <version>3.1.4</version>
<executions>
<!-- Run scala compiler in the process-resources phase, so that dependencies on
scala classes can be resolved later in the (Java) compile phase -->
http://git-wip-us.apache.org/repos/asf/flink/blob/70a0479c/flink-batch-connectors/flink-hcatalog/src/main/scala/org/apache/flink/hcatalog/scala/HCatInputFormat.scala
----------------------------------------------------------------------
diff --git a/flink-batch-connectors/flink-hcatalog/src/main/scala/org/apache/flink/hcatalog/scala/HCatInputFormat.scala b/flink-batch-connectors/flink-hcatalog/src/main/scala/org/apache/flink/hcatalog/scala/HCatInputFormat.scala
index d5a3cbf..0299ee1 100644
--- a/flink-batch-connectors/flink-hcatalog/src/main/scala/org/apache/flink/hcatalog/scala/HCatInputFormat.scala
+++ b/flink-batch-connectors/flink-hcatalog/src/main/scala/org/apache/flink/hcatalog/scala/HCatInputFormat.scala
@@ -28,7 +28,7 @@ import org.apache.hive.hcatalog.data.schema.HCatFieldSchema
* A InputFormat to read from HCatalog tables.
* The InputFormat supports projection (selection and order of fields) and partition filters.
*
- * Data can be returned as {@link HCatRecord} or Scala tuples.
+ * Data can be returned as [[HCatRecord]] or Scala tuples.
* Scala tuples support only up to 22 fields.
*
*/
http://git-wip-us.apache.org/repos/asf/flink/blob/70a0479c/flink-streaming-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml
index 0ea80d0..ce56167 100644
--- a/flink-streaming-scala/pom.xml
+++ b/flink-streaming-scala/pom.xml
@@ -215,7 +215,7 @@ under the License.
</configuration>
</plugin>
- <!-- Exclude generated classes from api compatibilty checks -->
+ <!-- Exclude generated classes from api compatibility checks -->
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>