You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2014/07/22 12:41:27 UTC

[87/92] [abbrv] git commit: [FLINK-1031] Fix POM files to support Eclipse

[FLINK-1031] Fix POM files to support Eclipse


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

Branch: refs/heads/travis_test
Commit: 05677f3d6812a191c54aedf9bcbf152273d6c054
Parents: 152dcde
Author: Stephan Ewen <se...@apache.org>
Authored: Mon Jul 21 12:28:25 2014 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Mon Jul 21 12:28:25 2014 +0200

----------------------------------------------------------------------
 flink-addons/flink-avro/pom.xml | 29 ++++++++++++++++++-----------
 flink-clients/pom.xml           | 17 ++++++++++++++++-
 flink-tests/pom.xml             | 15 ++++++++++++++-
 3 files changed, 48 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/05677f3d/flink-addons/flink-avro/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/pom.xml b/flink-addons/flink-avro/pom.xml
index 33dd01d..1ffa8d0 100644
--- a/flink-addons/flink-avro/pom.xml
+++ b/flink-addons/flink-avro/pom.xml
@@ -100,7 +100,7 @@ under the License.
 			is properly used.-->
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.5</version>
+				<version>2.5</version><!--$NO-MVN-MAN-VER$-->
 				<executions>
 					<execution>
 						<id>remove-avroexternalprogram</id>
@@ -137,21 +137,28 @@ under the License.
 							<pluginExecutions>
 								<pluginExecution>
 									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-assembly-plugin
-										</artifactId>
-										<versionRange>
-											[2.4,)
-										</versionRange>
+										<groupId>org.apache.maven.plugins</groupId>
+										<artifactId>maven-assembly-plugin</artifactId>
+										<versionRange>[2.4,)</versionRange>
 										<goals>
 											<goal>single</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore></ignore>
+										<ignore/>
+									</action>
+								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.apache.maven.plugins</groupId>
+										<artifactId>maven-clean-plugin</artifactId>
+										<versionRange>[1,)</versionRange>
+										<goals>
+											<goal>clean</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore/>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/05677f3d/flink-clients/pom.xml
----------------------------------------------------------------------
diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml
index 8944385..29ce3e6 100644
--- a/flink-clients/pom.xml
+++ b/flink-clients/pom.xml
@@ -132,7 +132,7 @@ under the License.
 			is properly used.-->
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.5</version>
+				<version>2.5</version><!--$NO-MVN-MAN-VER$-->
 				<executions>
 					<execution>
 						<id>remove-externaltestclasses</id>
@@ -185,6 +185,21 @@ under the License.
 										<ignore></ignore>
 									</action>
 								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.apache.maven.plugins</groupId>
+										<artifactId>maven-clean-plugin</artifactId>
+										<versionRange>[1,)</versionRange>
+										<goals>
+											<goal>clean</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore/>
+									</action>
+								</pluginExecution>
+								
+								
 							</pluginExecutions>
 						</lifecycleMappingMetadata>
 					</configuration>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/05677f3d/flink-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index 80139c6..1a94baf 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -162,7 +162,7 @@ under the License.
 			is properly used.-->
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.5</version>
+				<version>2.5</version><!--$NO-MVN-MAN-VER$-->
 				<executions>
 					<execution>
 						<id>remove-kmeansfortest</id>
@@ -216,6 +216,19 @@ under the License.
 										<ignore></ignore>
 									</action>
 								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.apache.maven.plugins</groupId>
+										<artifactId>maven-clean-plugin</artifactId>
+										<versionRange>[1,)</versionRange>
+										<goals>
+											<goal>clean</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore/>
+									</action>
+								</pluginExecution>
 							</pluginExecutions>
 						</lifecycleMappingMetadata>
 					</configuration>