Merge pull request #521 from dhalperi/archetype-notice

dhalperi · web-flow · commit 02c6bc6b56f4 · 2017-01-05T23:27:24.000-08:00
Add NOTICE to archetypes and enforce they match the root NOTICE
diff --git a/.travis.yml b/.travis.yml
@@ -47,4 +47,8 @@ install:
   - travis_retry mvn install clean -U -DskipTests=true
 
 script:
-  - travis_retry mvn install -U
+  # Verify that the project can be built and installed.
+  - mvn install
+  # Verify that starter and examples archetypes have the correct version of the NOTICE file.
+  - diff -q NOTICE maven-archetypes/starter/src/main/resources/archetype-resources/NOTICE
+  - diff -q NOTICE maven-archetypes/examples/src/main/resources/archetype-resources/NOTICE
diff --git a/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -40,5 +40,12 @@
         <include>**/*.java</include>
       </includes>
     </fileSet>
+
+    <fileSet filtered="false" packaged="false" encoding="UTF-8">
+      <directory></directory>
+      <includes>
+        <include>NOTICE</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </archetype-descriptor>
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/NOTICE b/maven-archetypes/examples/src/main/resources/archetype-resources/NOTICE
@@ -0,0 +1,5 @@
+Google Cloud Dataflow SDK for Java
+Copyright 2017, Google Inc.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -32,5 +32,12 @@
         <include>**/*.java</include>
       </includes>
     </fileSet>
+
+    <fileSet filtered="false" packaged="false" encoding="UTF-8">
+      <directory></directory>
+      <includes>
+        <include>NOTICE</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </archetype-descriptor>
diff --git a/maven-archetypes/starter/src/main/resources/archetype-resources/NOTICE b/maven-archetypes/starter/src/main/resources/archetype-resources/NOTICE
@@ -0,0 +1,5 @@
+Google Cloud Dataflow SDK for Java
+Copyright 2017, Google Inc.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/maven-archetypes/starter/src/test/resources/projects/basic/reference/NOTICE b/maven-archetypes/starter/src/test/resources/projects/basic/reference/NOTICE
@@ -0,0 +1,5 @@
+Google Cloud Dataflow SDK for Java
+Copyright 2017, Google Inc.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
