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 2017/12/14 12:41:24 UTC

[1/2] flink git commit: [hotfix] [quickstarts] Fix indentation in Java Quickstart pom.xml

Repository: flink
Updated Branches:
  refs/heads/master 9f0b790d4 -> 840cbfbf0


[hotfix] [quickstarts] Fix indentation in Java Quickstart pom.xml


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a2ed8768
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a2ed8768
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a2ed8768

Branch: refs/heads/master
Commit: a2ed8768c67b33d0b3a365d4ee768d7301af5153
Parents: 9f0b790
Author: Stephan Ewen <se...@apache.org>
Authored: Thu Dec 14 13:29:43 2017 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Dec 14 13:29:43 2017 +0100

----------------------------------------------------------------------
 .../main/resources/archetype-resources/pom.xml    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/a2ed8768/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
index a29c5c5..ef900a1 100644
--- a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -156,8 +156,8 @@ under the License.
 			<build>
 				<plugins>
 					<!-- We use the maven-shade plugin to create a fat jar that contains all dependencies
-                    	except flink and its transitive dependencies. The resulting fat-jar can be executed
-                    	on a cluster. Change the value of Program-Class if your program entry point changes. -->
+						except flink and its transitive dependencies. The resulting fat-jar can be executed
+						on a cluster. Change the value of Program-Class if your program entry point changes. -->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-shade-plugin</artifactId>
@@ -190,14 +190,14 @@ under the License.
 										</filter>
 									</filters>
 									<!-- If you want to use ./bin/flink run <quickstart jar> uncomment the following lines.
-                             			This will add a Main-Class entry to the manifest file -->
+										This will add a Main-Class entry to the manifest file -->
 									<!--
-                             		<transformers>
-                             			<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                             			<mainClass>${package}.StreamingJob</mainClass>
-                             			</transformer>
-                            		</transformers>
-                             		-->
+									<transformers>
+										<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+										<mainClass>${package}.StreamingJob</mainClass>
+										</transformer>
+									</transformers>
+									-->
 								</configuration>
 							</execution>
 						</executions>


[2/2] flink git commit: [FLINK-8263] [quickstarts] Correctly set 'flink-core' to provided in Scala Quickstart pom.xml

Posted by se...@apache.org.
[FLINK-8263] [quickstarts] Correctly set 'flink-core' to provided in Scala Quickstart pom.xml


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/840cbfbf
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/840cbfbf
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/840cbfbf

Branch: refs/heads/master
Commit: 840cbfbf0845b60dbf02dd2f37f696f1db21b1e9
Parents: a2ed876
Author: Stephan Ewen <se...@apache.org>
Authored: Thu Dec 14 13:30:17 2017 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Dec 14 13:30:17 2017 +0100

----------------------------------------------------------------------
 .../src/main/resources/archetype-resources/pom.xml                  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/840cbfbf/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
index 1618b0e..ca41014 100644
--- a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -125,6 +125,7 @@ under the License.
 					<groupId>org.apache.flink</groupId>
 					<artifactId>flink-core</artifactId>
 					<version>${flink.version}</version>
+					<scope>provided</scope>
 				</dependency>
 				<dependency>
 					<groupId>org.apache.flink</groupId>