[MRM-767]

-added supplement model for unnamed/unknown jars included in the jetty-bundle


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673655 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 149 insertions, 0 deletions

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 68f2d91e8..f7fcece19 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -266,6 +266,14 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <configuration>
+          <supplementalModels>
+            <supplementalModel>notice-supplements.xml</supplementalModel>
+          </supplementalModels>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <pluginRepositories>
diff --git a/archiva-jetty/src/main/appended-resources/notice-supplements.xml b/archiva-jetty/src/main/appended-resources/notice-supplements.xml
new file mode 100644
index 000000000..61d380fb7
--- /dev/null
+++ b/archiva-jetty/src/main/appended-resources/notice-supplements.xml
@@ -0,0 +1,141 @@
+<supplementalDataModels>
+  <supplement>
+  	<project>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <name>Ant</name>
+      <url>http://ant.apache.org/</url>
+      <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+  	<project>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-jta</artifactId>
+      <name>Geronimo :: Java Transaction API Specification</name>
+      <url>http://geronimo.apache.org/</url>
+      <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+  	<project>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <name>JavaBeans Activation Framework (JAF)</name>
+      <organization>
+        <name>Sun Microsystems</name>
+        <url>http://www.sun.com/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>Common Development and Distribution License (CDDL) v1.0</name>
+          <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+  	<project>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <name>JavaMail API</name>
+      <organization>
+        <name>Sun Microsystems</name>
+        <url>http://www.sun.com/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>Common Development and Distribution License (CDDL) v1.0</name>
+          <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+  	<project>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <name>Xerces</name>
+      <url>http://xerces.apache.org/</url>
+      <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 1.1</name>
+          <url>http://www.apache.org/licenses/LICENSE</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+  	<project>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-compiler</artifactId>
+      <name>Tomcat Jasper Compiler</name>
+      <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+  	<project>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-compiler-jdt</artifactId>
+      <name>Tomcat Jasper Compiler JDT</name>
+      <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+  	<project>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-runtime</artifactId>
+      <name>Tomcat Jasper Runtime</name>
+      <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+</supplementalDataModels>
\ No newline at end of file