You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/07/17 19:15:17 UTC
[1/2] flink git commit: [FLINK-7058] Fix scala-2.10 dependencies
Repository: flink
Updated Branches:
refs/heads/release-1.3 4b003eafd -> 3c0f38369
[FLINK-7058] Fix scala-2.10 dependencies
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/09a4a4bd
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/09a4a4bd
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/09a4a4bd
Branch: refs/heads/release-1.3
Commit: 09a4a4bdfb03887387d47f366193d1216a66257c
Parents: 4b003ea
Author: Piotr Nowojski <pi...@gmail.com>
Authored: Fri Jun 30 18:19:59 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Mon Jul 17 21:11:13 2017 +0200
----------------------------------------------------------------------
flink-scala-shell/pom.xml | 6 +++---
flink-scala/pom.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/09a4a4bd/flink-scala-shell/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
index cf637d4..6c1f4a1 100644
--- a/flink-scala-shell/pom.xml
+++ b/flink-scala-shell/pom.xml
@@ -214,14 +214,14 @@ under the License.
<id>scala-2.10</id>
<activation>
<property>
- <!-- this is the default scala profile -->
- <name>!scala-2.11</name>
+ <name>scala-2.10</name>
</property>
</activation>
+ <!-- only required for Scala 2.10 -->
<dependencies>
<dependency>
<groupId>org.scalamacros</groupId>
- <artifactId>quasiquotes_${scala.binary.version}</artifactId>
+ <artifactId>quasiquotes_2.10</artifactId>
<version>${scala.macros.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/09a4a4bd/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index be97795..9047f62 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -251,14 +251,14 @@ under the License.
<id>scala-2.10</id>
<activation>
<property>
- <!-- this is the default scala profile -->
- <name>!scala-2.11</name>
+ <name>scala-2.10</name>
</property>
</activation>
+ <!-- only required for Scala 2.10 -->
<dependencies>
<dependency>
<groupId>org.scalamacros</groupId>
- <artifactId>quasiquotes_${scala.binary.version}</artifactId>
+ <artifactId>quasiquotes_2.10</artifactId>
<version>${scala.macros.version}</version>
</dependency>
</dependencies>
[2/2] flink git commit: [FLINK-7178] [metrics] Do not create separate
shaded jars
Posted by ch...@apache.org.
[FLINK-7178] [metrics] Do not create separate shaded jars
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3c0f3836
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3c0f3836
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3c0f3836
Branch: refs/heads/release-1.3
Commit: 3c0f38369000ed4a1a5f16140e7f88770a10057d
Parents: 09a4a4b
Author: zentol <ch...@apache.org>
Authored: Thu Jul 13 22:06:56 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Mon Jul 17 21:11:53 2017 +0200
----------------------------------------------------------------------
flink-dist/src/main/assemblies/opt.xml | 2 +-
flink-metrics/flink-metrics-datadog/pom.xml | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/3c0f3836/flink-dist/src/main/assemblies/opt.xml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index 90b3ec1..9a3b01e 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -105,7 +105,7 @@
</file>
<file>
- <source>../flink-metrics/flink-metrics-datadog/target/flink-metrics-datadog-${project.version}-shaded.jar</source>
+ <source>../flink-metrics/flink-metrics-datadog/target/flink-metrics-datadog-${project.version}.jar</source>
<outputDirectory>opt/</outputDirectory>
<destName>flink-metrics-datadog-${project.version}.jar</destName>
<fileMode>0644</fileMode>
http://git-wip-us.apache.org/repos/asf/flink/blob/3c0f3836/flink-metrics/flink-metrics-datadog/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-datadog/pom.xml b/flink-metrics/flink-metrics-datadog/pom.xml
index e2bd6fa..a02a626 100644
--- a/flink-metrics/flink-metrics-datadog/pom.xml
+++ b/flink-metrics/flink-metrics-datadog/pom.xml
@@ -88,7 +88,6 @@ under the License.
<goal>shade</goal>
</goals>
<configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
<relocations combine.children="append">
<relocation>
<pattern>okhttp3</pattern>