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 2015/05/18 19:48:23 UTC

flink git commit: [FLINK-2022] Put default log4j.properties into quickstart projects

Repository: flink
Updated Branches:
  refs/heads/master 31d19dfc3 -> 390021edc


[FLINK-2022] Put default log4j.properties into quickstart projects


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

Branch: refs/heads/master
Commit: 390021edcfcc3f82c29a49d5eb2bb3336084c492
Parents: 31d19df
Author: Robert Metzger <rm...@apache.org>
Authored: Mon May 18 16:44:16 2015 +0200
Committer: Robert Metzger <rm...@apache.org>
Committed: Mon May 18 19:48:03 2015 +0200

----------------------------------------------------------------------
 .../src/main/resources/META-INF/maven/archetype-metadata.xml       | 2 +-
 .../src/main/resources/META-INF/maven/archetype-metadata.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/390021ed/flink-quickstart/flink-quickstart-java/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/META-INF/maven/archetype-metadata.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/META-INF/maven/archetype-metadata.xml
index 2a9a981..55d2497 100644
--- a/flink-quickstart/flink-quickstart-java/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/flink-quickstart/flink-quickstart-java/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -30,7 +30,7 @@ under the License.
 			</includes>
 		</fileSet>
 		<fileSet encoding="UTF-8">
-			<directory>src/assembly</directory>
+			<directory>src/main/resources</directory>
 		</fileSet>
 	</fileSets>
 </archetype-descriptor>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink/blob/390021ed/flink-quickstart/flink-quickstart-scala/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/META-INF/maven/archetype-metadata.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/META-INF/maven/archetype-metadata.xml
index 4a19bca..afb1e44 100644
--- a/flink-quickstart/flink-quickstart-scala/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/flink-quickstart/flink-quickstart-scala/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -30,7 +30,7 @@ under the License.
 			</includes>
 		</fileSet>
 		<fileSet encoding="UTF-8">
-			<directory>src/assembly</directory>
+			<directory>src/main/resources</directory>
 		</fileSet>
 	</fileSets>
 </archetype-descriptor>
\ No newline at end of file