You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2020/03/17 09:55:57 UTC
[flink-statefun] branch master updated: [FLINK-16603] Fix
quickstart Maven archetype
This is an automated email from the ASF dual-hosted git repository.
tzulitai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-statefun.git
The following commit(s) were added to refs/heads/master by this push:
new 39f9916 [FLINK-16603] Fix quickstart Maven archetype
39f9916 is described below
commit 39f9916a8569ecb9e3a4e295d245f22cfcfd5b6e
Author: Tzu-Li (Gordon) Tai <tz...@apache.org>
AuthorDate: Mon Mar 16 15:47:27 2020 +0800
[FLINK-16603] Fix quickstart Maven archetype
This closes #59.
---
pom.xml | 3 +++
statefun-quickstart/pom.xml | 7 +++++++
.../resources/META-INF/maven/archetype-metadata.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 ++
.../projects/testArtifact/archetype.properties | 21 +++++++++++++++++++++
.../test/resources/projects/testArtifact/goal.txt | 1 +
6 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d29bc3c..100d2e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,6 +192,7 @@ under the License.
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.13</version>
+ <inherited>false</inherited>
<executions>
<execution>
<phase>verify</phase>
@@ -220,6 +221,8 @@ under the License.
<exclude>statefun-docs/docs/_templates/**</exclude>
<!-- Generated code -->
<exclude>**/generated/**</exclude>
+ <!-- Quickstart archetype test configuration -->
+ <exclude>statefun-quickstart/src/test/resources/projects/testArtifact/goal.txt</exclude>
<!-- Bundled license files -->
<exclude>**/LICENSE*</exclude>
<!-- Python venv -->
diff --git a/statefun-quickstart/pom.xml b/statefun-quickstart/pom.xml
index 8b4c1ed..ae63a80 100644
--- a/statefun-quickstart/pom.xml
+++ b/statefun-quickstart/pom.xml
@@ -22,6 +22,7 @@ under the License.
<artifactId>statefun-parent</artifactId>
<groupId>org.apache.flink</groupId>
<version>1.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -59,5 +60,11 @@ under the License.
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</build>
</project>
\ No newline at end of file
diff --git a/statefun-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/statefun-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
index 3ecce29..261ce14 100644
--- a/statefun-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/statefun-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -29,7 +29,7 @@ under the License.
<include>**/*.java</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
+ <fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
diff --git a/statefun-quickstart/src/main/resources/archetype-resources/pom.xml b/statefun-quickstart/src/main/resources/archetype-resources/pom.xml
index c5df4c1..2456330 100644
--- a/statefun-quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/statefun-quickstart/src/main/resources/archetype-resources/pom.xml
@@ -19,6 +19,8 @@ under the License.
xmlns="http://maven.apache.org/POM/4.0.0"
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>
diff --git a/statefun-quickstart/src/test/resources/projects/testArtifact/archetype.properties b/statefun-quickstart/src/test/resources/projects/testArtifact/archetype.properties
new file mode 100644
index 0000000..52855ac
--- /dev/null
+++ b/statefun-quickstart/src/test/resources/projects/testArtifact/archetype.properties
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+groupId=org.apache.flink.statefun.archetypetest
+artifactId=testArtifact
+version=1.0-SNAPSHOT
+package=org.apache.flink.statefun.archetypetest
diff --git a/statefun-quickstart/src/test/resources/projects/testArtifact/goal.txt b/statefun-quickstart/src/test/resources/projects/testArtifact/goal.txt
new file mode 100644
index 0000000..f8808ba
--- /dev/null
+++ b/statefun-quickstart/src/test/resources/projects/testArtifact/goal.txt
@@ -0,0 +1 @@
+compile
\ No newline at end of file