Repository: flink Updated Branches: refs/heads/master cc9ee2cc3 -> 508965e69
[FLINK-4111] [table] Flink Table & SQL doesn't work in very simple example This closes #2209. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/508965e6 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/508965e6 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/508965e6 Branch: refs/heads/master Commit: 508965e69cfb99724b69f1e5dc59e5f5d5a70315 Parents: cc9ee2c Author: twalthr <twal...@apache.org> Authored: Tue Jul 5 22:56:39 2016 +0200 Committer: twalthr <twal...@apache.org> Committed: Tue Jul 12 15:47:32 2016 +0200 ---------------------------------------------------------------------- flink-libraries/flink-cep-scala/pom.xml | 1 - flink-libraries/flink-gelly-scala/pom.xml | 1 - flink-libraries/flink-table/pom.xml | 204 ++++++++++--------------- flink-scala-shell/pom.xml | 1 - flink-scala/pom.xml | 1 - flink-streaming-scala/pom.xml | 1 - pom.xml | 7 + 7 files changed, 85 insertions(+), 131 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/508965e6/flink-libraries/flink-cep-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-cep-scala/pom.xml b/flink-libraries/flink-cep-scala/pom.xml index 878a187..773987c 100644 --- a/flink-libraries/flink-cep-scala/pom.xml +++ b/flink-libraries/flink-cep-scala/pom.xml @@ -98,7 +98,6 @@ under the License. <plugin> <groupId>net.alchim31.maven</groupId> <artifactId>scala-maven-plugin</artifactId> - <version>3.2.2</version> <executions> <execution> <goals> http://git-wip-us.apache.org/repos/asf/flink/blob/508965e6/flink-libraries/flink-gelly-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-gelly-scala/pom.xml b/flink-libraries/flink-gelly-scala/pom.xml index 23b4037..01843b9 100644 --- a/flink-libraries/flink-gelly-scala/pom.xml +++ b/flink-libraries/flink-gelly-scala/pom.xml @@ -83,7 +83,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/508965e6/flink-libraries/flink-table/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml index 46be2a1..18ca3e4 100644 --- a/flink-libraries/flink-table/pom.xml +++ b/flink-libraries/flink-table/pom.xml @@ -38,53 +38,60 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-scala_2.10</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.flink</groupId> <artifactId>flink-streaming-scala_2.10</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-reflect</artifactId> - </dependency> - - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - </dependency> - - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - </dependency> - - <dependency> <groupId>org.codehaus.janino</groupId> <artifactId>janino</artifactId> <version>2.7.5</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </dependency> - - <dependency> <groupId>org.apache.calcite</groupId> <artifactId>calcite-core</artifactId> <version>1.7.0</version> + <exclusions> + <exclusion> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-metrics</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + <exclusion> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + </exclusion> + <exclusion> + <groupId>org.pentaho</groupId> + <artifactId>pentaho-aggdesigner-algorithm</artifactId> + </exclusion> + </exclusions> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> - </dependency> <!-- test dependencies --> @@ -110,14 +117,6 @@ under the License. <type>test-jar</type> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <type>test-jar</type> - </dependency> </dependencies> <build> @@ -126,7 +125,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 --> @@ -134,6 +132,7 @@ under the License. <id>scala-compile-first</id> <phase>process-resources</phase> <goals> + <goal>add-source</goal> <goal>compile</goal> </goals> </execution> @@ -148,80 +147,52 @@ under the License. </goals> </execution> </executions> - <configuration> - <jvmArgs> - <jvmArg>-Xms128m</jvmArg> - <jvmArg>-Xmx512m</jvmArg> - </jvmArgs> - <compilerPlugins combine.children="append"> - <compilerPlugin> - <groupId>org.scalamacros</groupId> - <artifactId>paradise_${scala.version}</artifactId> - <version>${scala.macros.version}</version> - </compilerPlugin> - </compilerPlugins> - </configuration> </plugin> - <!-- Eclipse Integration --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.8</version> - <configuration> - <downloadSources>true</downloadSources> - <projectnatures> - <projectnature>org.scala-ide.sdt.core.scalanature</projectnature> - <projectnature>org.eclipse.jdt.core.javanature</projectnature> - </projectnatures> - <buildcommands> - <buildcommand>org.scala-ide.sdt.core.scalabuilder</buildcommand> - </buildcommands> - <classpathContainers> - <classpathContainer>org.scala-ide.sdt.launching.SCALA_CONTAINER</classpathContainer> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer> - </classpathContainers> - <excludes> - <exclude>org.scala-lang:scala-library</exclude> - <exclude>org.scala-lang:scala-compiler</exclude> - </excludes> - <sourceIncludes> - <sourceInclude>**/*.scala</sourceInclude> - <sourceInclude>**/*.java</sourceInclude> - </sourceIncludes> - </configuration> - </plugin> - - <!-- Adding scala source directories to build path --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> + <artifactId>maven-shade-plugin</artifactId> <executions> - <!-- Add src/main/scala to eclipse build path --> <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> + <id>shade-flink</id> <configuration> - <sources> - <source>src/main/scala</source> - </sources> - </configuration> - </execution> - <!-- Add src/test/scala to eclipse build path --> - <execution> - <id>add-test-source</id> - <phase>generate-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>src/test/scala</source> - </sources> + <filters> + <filter> + <excludes> + <exclude>org-apache-calcite-jdbc.properties</exclude> + <exclude>mozilla/**</exclude> + <exclude>codegen/**</exclude> + <exclude>google/**</exclude> + </excludes> + </filter> + </filters> + <artifactSet> + <includes combine.children="append"> + <include>org.apache.calcite:*</include> + <include>org.apache.calcite.avatica:*</include> + <include>net.hydromatic:*</include> + </includes> + </artifactSet> + <relocations> + <!-- We currently don't relocate slf4j as we have "logger not found" + warnings otherwise during runtime --> + <!--<relocation> + <pattern>org.slf4j</pattern> + <shadedPattern>org.apache.flink.shaded.calcite.org.slf4j</shadedPattern> + </relocation>--> + <relocation> + <pattern>com.fasterxml.jackson</pattern> + <shadedPattern>org.apache.flink.shaded.calcite.com.fasterxml.jackson</shadedPattern> + </relocation> + <relocation> + <pattern>com.google</pattern> + <shadedPattern>org.apache.flink.shaded.calcite.com.google</shadedPattern> + </relocation> + <relocation> + <pattern>org.eigenbase</pattern> + <shadedPattern>org.apache.flink.shaded.calcite.org.eigenbase</shadedPattern> + </relocation> + </relocations> </configuration> </execution> </executions> @@ -239,23 +210,4 @@ under the License. </plugins> </build> - <profiles> - <profile> - <id>scala-2.10</id> - <activation> - <property> - <!-- this is the default scala profile --> - <name>!scala-2.11</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.scalamacros</groupId> - <artifactId>quasiquotes_${scala.binary.version}</artifactId> - <version>${scala.macros.version}</version> - </dependency> - </dependencies> - </profile> - </profiles> - </project> http://git-wip-us.apache.org/repos/asf/flink/blob/508965e6/flink-scala-shell/pom.xml ---------------------------------------------------------------------- diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml index bd935ee..16875bc 100644 --- a/flink-scala-shell/pom.xml +++ b/flink-scala-shell/pom.xml @@ -95,7 +95,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/508965e6/flink-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml index 83e0f46..58ea7a2 100644 --- a/flink-scala/pom.xml +++ b/flink-scala/pom.xml @@ -110,7 +110,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/508965e6/flink-streaming-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml index b82faf1..0ea80d0 100644 --- a/flink-streaming-scala/pom.xml +++ b/flink-streaming-scala/pom.xml @@ -106,7 +106,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/508965e6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a161cdc..4594a9d 100644 --- a/pom.xml +++ b/pom.xml @@ -1245,6 +1245,13 @@ under the License. <outputEncoding>UTF-8</outputEncoding> </configuration> </plugin> + + <!-- set scala maven plugin version --> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <version>3.2.2</version> + </plugin> </plugins> </pluginManagement> </build>
