flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/3] flink git commit: [FLINK-1386] [quickstart] Fix pom in java quickstart archetype
Date Sun, 11 Jan 2015 19:36:26 GMT
Repository: flink
Updated Branches:
  refs/heads/master 6b36fd20f -> 3a39352bb


[FLINK-1386] [quickstart] Fix pom in java quickstart archetype


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

Branch: refs/heads/master
Commit: 3a39352bb621f946551088210762199edb43ae2f
Parents: ecb5595
Author: Stephan Ewen <sewen@apache.org>
Authored: Sun Jan 11 20:08:28 2015 +0100
Committer: Stephan Ewen <sewen@apache.org>
Committed: Sun Jan 11 20:09:02 2015 +0100

----------------------------------------------------------------------
 .../main/resources/archetype-resources/pom.xml  | 40 +++++++++++++-------
 1 file changed, 27 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/3a39352b/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 48afe6d..adc6ab5 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
@@ -61,6 +61,11 @@ under the License.
 		</dependency>
 		<dependency>
 			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-streaming-connectors</artifactId>
+			<version>0.9-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-clients</artifactId>
 			<version>0.9-SNAPSHOT</version>
 		</dependency>
@@ -109,7 +114,6 @@ under the License.
 				</configuration>
 			</plugin>
 
-			<!-- We use the JDT compiler because it adds the generic types of methods (also lambdas)
to the class files-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -117,22 +121,32 @@ under the License.
 				<configuration>
 					<source>1.6</source> <!-- If you want to use Java 8, change this to "1.8"
-->
 					<target>1.6</target> <!-- If you want to use Java 8, change this to "1.8"
-->
-					<compilerId>jdt</compilerId>
 				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-compiler-jdt</artifactId>
-						<version>0.21.0</version>
-					</dependency>
-				</dependencies>
 			</plugin>
 		</plugins>
 		
-		<!-- Eclipse should not evaluate the compiler plugin, but use its own settings -->
+			
+		<!-- If you want to use Java 8 Lambda Expressions uncomment the following lines -->
+		<!--
 		<pluginManagement>
 			<plugins>
 				<plugin>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<configuration>
+						<source>1.8</source>
+						<target>1.8</target>
+						<compilerId>jdt</compilerId>
+					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-compiler-jdt</artifactId>
+							<version>0.21.0</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+		
+				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
 					<version>1.0.0</version>
@@ -149,7 +163,7 @@ under the License.
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore></ignore>
+										<ignore/>
 									</action>
 								</pluginExecution>
 								<pluginExecution>
@@ -159,11 +173,10 @@ under the License.
 										<versionRange>[3.1,)</versionRange>
 										<goals>
 											<goal>testCompile</goal>
-											<goal>compile</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore></ignore>
+										<ignore/>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>
@@ -172,6 +185,7 @@ under the License.
 				</plugin>
 			</plugins>
 		</pluginManagement>
+		-->
 		
 	</build>
 </project>


Mime
View raw message