Merge pull request #523 from dhalperi/archetype-notice-v2

Move NOTICE to the right location

Author: dhalperi

.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

maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -40,12 +40,5 @@
         <include>**/*.java</include>
       </includes>
     </fileSet>
-
-    <fileSet filtered="false" packaged="false" encoding="UTF-8">
-      <directory></directory>
-      <includes>
-        <include>NOTICE</include>
-      </includes>
-    </fileSet>
   </fileSets>
 </archetype-descriptor>

…ain/resources/archetype-resources/NOTICE …types/examples/src/main/resources/NOTICEmaven-archetypes/examples/src/main/resources/archetype-resources/NOTICE renamed to maven-archetypes/examples/src/main/resources/NOTICE maven-archetypes/examples/src/main/resources/archetype-resources/NOTICE renamed to maven-archetypes/examples/src/main/resources/NOTICE

@@ -32,12 +32,5 @@
         <include>**/*.java</include>
       </includes>
     </fileSet>
-
-    <fileSet filtered="false" packaged="false" encoding="UTF-8">
-      <directory></directory>
-      <includes>
-        <include>NOTICE</include>
-      </includes>
-    </fileSet>
   </fileSets>
 </archetype-descriptor>