flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/6] git commit: [FLINK-1114] Move scala-style checks to scala projects, change paths to style conifg, to allow isolated building of individual projects.
Date Tue, 23 Sep 2014 21:49:38 GMT
Repository: incubator-flink
Updated Branches:
  refs/heads/master b904b0041 -> 4a91be2e4


[FLINK-1114] Move scala-style checks to scala projects, change paths to style conifg, to allow
isolated building of individual projects.


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

Branch: refs/heads/master
Commit: cf80d8627728a719c3ef2be8f31ef77077b9d200
Parents: b904b00
Author: Stephan Ewen <sewen@apache.org>
Authored: Tue Sep 23 19:24:21 2014 +0200
Committer: Stephan Ewen <sewen@apache.org>
Committed: Tue Sep 23 19:24:21 2014 +0200

----------------------------------------------------------------------
 .../java/graph/TransitiveClosureNaive.java      |  2 +-
 flink-examples/flink-scala-examples/pom.xml     | 36 +++++++++++---
 flink-scala/pom.xml                             | 24 ++++++++++
 pom.xml                                         | 49 ++++++--------------
 4 files changed, 68 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/cf80d862/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java
----------------------------------------------------------------------
diff --git a/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java
b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java
index c3e3e66..c7f2185 100644
--- a/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java
+++ b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java
@@ -80,7 +80,7 @@ public class TransitiveClosureNaive implements ProgramDescription {
 				.coGroup(nextPaths)
 				.where(0).equalTo(0)
 				.with(new CoGroupFunction<Tuple2<Long, Long>, Tuple2<Long, Long>, Tuple2<Long,
Long>>() {
-					Set prevSet = new HashSet<Tuple2<Long,Long>>();
+					Set<Tuple2<Long,Long>> prevSet = new HashSet<Tuple2<Long,Long>>();
 					@Override
 					public void coGroup(Iterable<Tuple2<Long, Long>> prevPaths, Iterable<Tuple2<Long,
Long>> nextPaths, Collector<Tuple2<Long, Long>> out) throws Exception {
 						for (Tuple2<Long,Long> prev : prevPaths) {

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/cf80d862/flink-examples/flink-scala-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/flink-scala-examples/pom.xml b/flink-examples/flink-scala-examples/pom.xml
index 79053d6..a3eba40 100644
--- a/flink-examples/flink-scala-examples/pom.xml
+++ b/flink-examples/flink-scala-examples/pom.xml
@@ -146,6 +146,30 @@ under the License.
 			</plugin>
 
 			<plugin>
+				<groupId>org.scalastyle</groupId>
+				<artifactId>scalastyle-maven-plugin</artifactId>
+				<version>0.5.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<verbose>false</verbose>
+					<failOnViolation>true</failOnViolation>
+					<includeTestSourceDirectory>true</includeTestSourceDirectory>
+					<failOnWarning>false</failOnWarning>
+					<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
+					<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
+					<configLocation>${project.basedir}/../../tools/maven/scalastyle-config.xml</configLocation>
+					<outputFile>${project.basedir}/scalastyle-output.xml</outputFile>
+					<outputEncoding>UTF-8</outputEncoding>
+				</configuration>
+			</plugin>
+			
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<executions>
@@ -237,7 +261,6 @@ under the License.
 							</includes>
 						</configuration>
 					</execution>
-					   -->
 
 					<execution>
 						<id>WordCount</id>
@@ -257,10 +280,11 @@ under the License.
 		
 							<includes>
 								<include>**/wordcount/WordCount*.class</include>
+								<include>**/wordcount/util/WordCountData.class</include>
 							</includes>
 						</configuration>
 					</execution>
-					<!--
+					
 					<execution>
 						<id>ConnectedComponents</id>
 						<phase>package</phase>
@@ -275,13 +299,11 @@ under the License.
 								</manifestEntries>
 							</archive>
 							<includes>
-								<include>**/graph/ConnectedComponents*.class</include>
+								DOES NOT WORK <include>**/graph/ConnectedComponents*.class</include>
 							</includes>
 						</configuration>
 					</execution>
 					
-					-->
-
 					<execution>
 						<id>TransitiveClosureNaive</id>
 						<phase>package</phase>
@@ -300,10 +322,12 @@ under the License.
 
 							<includes>
 								<include>**/wordcount/TransitiveClosureNaive*.class</include>
+								  DOES NOT WORK <include>**/java/graph/util/ConnectedComponentsData.class</include>
 							</includes>
 						</configuration>
 					</execution>
-
+					-->
+					
 				</executions>
 			</plugin>
 			

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/cf80d862/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index dfd9419..c0a156d 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -199,6 +199,30 @@ under the License.
 				</executions>
 			</plugin>
 			
+			<plugin>
+				<groupId>org.scalastyle</groupId>
+				<artifactId>scalastyle-maven-plugin</artifactId>
+				<version>0.5.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<verbose>false</verbose>
+					<failOnViolation>true</failOnViolation>
+					<includeTestSourceDirectory>true</includeTestSourceDirectory>
+					<failOnWarning>false</failOnWarning>
+					<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
+					<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
+					<configLocation>${project.basedir}/../tools/maven/scalastyle-config.xml</configLocation>
+					<outputFile>${project.basedir}/scalastyle-output.xml</outputFile>
+					<outputEncoding>UTF-8</outputEncoding>
+				</configuration>
+			</plugin>
+			
 		</plugins>
 	</build>
 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/cf80d862/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a339702..f18b4c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,20 +84,20 @@ under the License.
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 			<version>3.1</version>
+			</dependency>
+	
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+	
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.0.13</version>
+			<scope>runtime</scope>
 		</dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.0.13</version>
-            <scope>runtime</scope>
-        </dependency>
 
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -559,29 +559,6 @@ under the License.
 				</configuration>
 			</plugin>
 			<plugin>
-            	<groupId>org.scalastyle</groupId>
-           		<artifactId>scalastyle-maven-plugin</artifactId>
-            	<version>0.5.0</version>
-            	<configuration>
-              		<verbose>false</verbose>
-              		<failOnViolation>true</failOnViolation>
-              		<includeTestSourceDirectory>true</includeTestSourceDirectory>
-              		<failOnWarning>false</failOnWarning>
-              		<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
-              		<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
-              		<configLocation>tools/maven/scalastyle-config.xml</configLocation>
-              		<outputFile>${project.basedir}/scalastyle-output.xml</outputFile>
-              		<outputEncoding>UTF-8</outputEncoding>
-            	</configuration>
-            	<executions>
-              		<execution>
-                		<goals>
-                  			<goal>check</goal>
-                		</goals>
-              		</execution>
-            	</executions>
-          </plugin>
-			<plugin>
 				<!-- just define the Java version to be used for compiling and plugins -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>


Mime
View raw message