diff --git a/.travis.yml b/.travis.yml index d72ff70f8e..8fa5d9a932 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,5 +50,5 @@ script: # 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 -q NOTICE maven-archetypes/starter/src/main/resources/NOTICE + - diff -q NOTICE maven-archetypes/examples/src/main/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 index 1d26f20888..2b9eb52d80 100644 --- 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,12 +40,5 @@ **/*.java - - - - - NOTICE - - diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/NOTICE b/maven-archetypes/examples/src/main/resources/NOTICE similarity index 100% rename from maven-archetypes/examples/src/main/resources/archetype-resources/NOTICE rename to maven-archetypes/examples/src/main/resources/NOTICE 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 index d8ded73555..4c22d5d68b 100644 --- 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,12 +32,5 @@ **/*.java - - - - - NOTICE - - diff --git a/maven-archetypes/starter/src/main/resources/archetype-resources/NOTICE b/maven-archetypes/starter/src/main/resources/NOTICE similarity index 100% rename from maven-archetypes/starter/src/main/resources/archetype-resources/NOTICE rename to maven-archetypes/starter/src/main/resources/NOTICE diff --git a/maven-archetypes/starter/src/test/resources/projects/basic/reference/NOTICE b/maven-archetypes/starter/src/test/resources/projects/basic/reference/NOTICE deleted file mode 100644 index 981fde5a9e..0000000000 --- a/maven-archetypes/starter/src/test/resources/projects/basic/reference/NOTICE +++ /dev/null @@ -1,5 +0,0 @@ -Google Cloud Dataflow SDK for Java -Copyright 2017, Google Inc. - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/).