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 2017/05/19 09:44:11 UTC
flink git commit: [FLINK-6582] [docs] Project from maven archetype is
not buildable by default
Repository: flink
Updated Branches:
refs/heads/master 0162543ac -> 6ae759ae5
[FLINK-6582] [docs] Project from maven archetype is not buildable by default
The pom.xml for flink-quickstart-java and flink-quickstart-scala must
specify scala.version and scala.binary.version.
This closes #3910
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6ae759ae
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6ae759ae
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6ae759ae
Branch: refs/heads/master
Commit: 6ae759ae5ece9cfa95bf49ddd44c17397903eaca
Parents: 0162543
Author: Greg Hogan <co...@greghogan.com>
Authored: Mon May 15 09:35:36 2017 -0400
Committer: Robert Metzger <rm...@apache.org>
Committed: Fri May 19 11:43:30 2017 +0200
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 14 ++++++--------
.../main/resources/archetype-resources/pom.xml | 5 +++--
flink-quickstart/pom.xml | 18 ++++++++++++++++++
3 files changed, 27 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/6ae759ae/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 9991d2c..44c56b9 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
@@ -19,7 +19,7 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
@@ -33,6 +33,7 @@ under the License.
<flink.version>1.4-SNAPSHOT</flink.version>
<slf4j.version>1.7.7</slf4j.version>
<log4j.version>1.2.17</log4j.version>
+ <scala.binary.version>@scala.binary.version@</scala.binary.version>
</properties>
<repositories>
@@ -48,9 +49,9 @@ under the License.
</snapshots>
</repository>
</repositories>
-
+
<!--
-
+
Execute "mvn clean package -Pbuild-jar"
to build a jar file out of this project!
@@ -103,7 +104,6 @@ under the License.
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
-
</dependencies>
<profiles>
@@ -312,8 +312,7 @@ under the License.
</configuration>
</plugin>
</plugins>
-
-
+
<!-- If you want to use Java 8 Lambda Expressions uncomment the following lines -->
<!--
<pluginManagement>
@@ -333,7 +332,7 @@ under the License.
</dependency>
</dependencies>
</plugin>
-
+
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
@@ -375,6 +374,5 @@ under the License.
</plugins>
</pluginManagement>
-->
-
</build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/6ae759ae/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 2139c6b..ff33a6e 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
@@ -48,10 +48,11 @@ under the License.
<flink.version>1.4-SNAPSHOT</flink.version>
<slf4j.version>1.7.7</slf4j.version>
<log4j.version>1.2.17</log4j.version>
+ <scala.binary.version>@scala.binary.version@</scala.binary.version>
</properties>
<!--
-
+
Execute "mvn clean package -Pbuild-jar"
to build a jar file out of this project!
@@ -91,7 +92,7 @@ under the License.
<artifactId>flink-clients_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
</dependency>
-
+
<!-- explicitly add a standard loggin framework, as Flink does not have
a hard dependency on one specific framework by default -->
<dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/6ae759ae/flink-quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/pom.xml b/flink-quickstart/pom.xml
index 7e1b460..ea669cd 100644
--- a/flink-quickstart/pom.xml
+++ b/flink-quickstart/pom.xml
@@ -80,6 +80,24 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
+
+ <!-- use alternative delimiter for filtering resources -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>@</delimiter>
+ </delimiters>
+ </configuration>
+ </plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</build>
</project>