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

Move NOTICE to the right location
GoogleCloudPlatform · Jan 6, 2017 · 34c7b8a · 34c7b8a
2 parents 31f13b1 + 518f462
commit 34c7b8a
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 21 deletions.
diff --git 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
@@ -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>
diff --git a/...main/resources/archetype-resources/NOTICE → ...etypes/examples/src/main/resources/NOTICE b/...main/resources/archetype-resources/NOTICE → ...etypes/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
@@ -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>
diff --git a/...main/resources/archetype-resources/NOTICE → ...hetypes/starter/src/main/resources/NOTICE b/...main/resources/archetype-resources/NOTICE → ...hetypes/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