Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
b7ce6119
F
flink
项目概览
doujutun3207
/
flink
与 Fork 源项目一致
从无法访问的项目Fork
通知
24
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flink
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b7ce6119
编写于
4月 23, 2020
作者:
J
Jeff Zhang
提交者:
Aljoscha Krettek
4月 27, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-10911][scala-shell] Enable flink-scala-shell with Scala 2.12
上级
bd3be007
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
46 deletion
+7
-46
flink-dist/pom.xml
flink-dist/pom.xml
+6
-18
pom.xml
pom.xml
+1
-28
未找到文件。
flink-dist/pom.xml
浏览文件 @
b7ce6119
...
...
@@ -143,6 +143,12 @@ under the License.
</exclusions>
</dependency>
<dependency>
<groupId>
org.apache.flink
</groupId>
<artifactId>
flink-scala-shell_${scala.binary.version}
</artifactId>
<version>
${project.version}
</version>
</dependency>
<!-- Default file system support. The Hadoop and MapR dependencies -->
<!-- are optional, so not being added to the dist jar -->
...
...
@@ -442,24 +448,6 @@ under the License.
</dependencies>
<profiles>
<profile>
<id>
scala-2.11
</id>
<activation>
<property>
<name>
!scala-2.12
</name>
</property>
</activation>
<!-- Scala Shell doesn't currently work with Scala 2.12 so only include
when building for Scala 2.11. -->
<dependencies>
<dependency>
<groupId>
org.apache.flink
</groupId>
<artifactId>
flink-scala-shell_${scala.binary.version}
</artifactId>
<version>
${project.version}
</version>
</dependency>
</dependencies>
</profile>
<profile>
<!-- Copies that shaded Hadoop uber jar to the dist folder. -->
<id>
include-hadoop
</id>
...
...
pom.xml
浏览文件 @
b7ce6119
...
...
@@ -72,6 +72,7 @@ under the License.
<module>
flink-end-to-end-tests
</module>
<module>
flink-test-utils-parent
</module>
<module>
flink-state-backends
</module>
<module>
flink-scala-shell
</module>
<module>
flink-libraries
</module>
<module>
flink-table
</module>
<module>
flink-quickstart
</module>
...
...
@@ -778,11 +779,6 @@ under the License.
<name>
!scala-2.12
</name>
</property>
</activation>
<!-- Scala Shell doesn't currently work with Scala 2.12 so only include
when building for Scala 2.11. -->
<modules>
<module>
flink-scala-shell
</module>
</modules>
<build>
<plugins>
<!-- make sure we don't have any _2.10 or _2.12 dependencies when building
...
...
@@ -827,29 +823,6 @@ under the License.
</activation>
<build>
<plugins>
<!-- don't run tests that don't work for Scala 2.12, because not all of the
required test dependencies are available for Scala 2.12. The Kafka 0.9 connector
still works with Scala 2.12 because it only needs the scala-version-independent
kafka-clients dependency at runtime. -->
<plugin>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
build-helper-maven-plugin
</artifactId>
<executions>
<execution>
<id>
regex-property
</id>
<goals>
<goal>
regex-property
</goal>
</goals>
<configuration>
<name>
maven.test.skip
</name>
<value>
${project.artifactId}
</value>
<regex>
(flink-scala-shell.*)
</regex>
<replacement>
true
</replacement>
<failIfNoMatch>
false
</failIfNoMatch>
</configuration>
</execution>
</executions>
</plugin>
<!-- make sure we don't have any _2.10 or _2.11 dependencies when building
for Scala 2.12 -->
<plugin>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录