You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/07/02 22:25:08 UTC

svn commit: r1356459 - in /archiva/trunk: ./ archiva-modules/archiva-web/ archiva-modules/archiva-web/archiva-rest/archiva-rest-services/ archiva-modules/archiva-web/archiva-web-common/src/main/resources/ archiva-modules/archiva-web/archiva-webapp/ arc...

Author: olamy
Date: Mon Jul  2 20:25:06 2012
New Revision: 1356459

URL: http://svn.apache.org/viewvc?rev=1356459&view=rev
Log:
fix some issues reported by rat check

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/archiva-mime-types.txt
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld
    archiva/trunk/archiva-modules/archiva-web/pom.xml
    archiva/trunk/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1356459&r1=1356458&r2=1356459&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml Mon Jul  2 20:25:06 2012
@@ -368,6 +368,8 @@
           <configuration>
             <excludes>
               <exclude>src/test/repo-with-osgi/**</exclude>
+              <exclude>src/test/repo-with-classifier-only/**</exclude>
+              <exclude>src/test/repo-with-snapshots/**</exclude>
             </excludes>
           </configuration>
         </plugin>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/archiva-mime-types.txt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/archiva-mime-types.txt?rev=1356459&r1=1356458&r2=1356459&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/archiva-mime-types.txt (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/archiva-mime-types.txt Mon Jul  2 20:25:06 2012
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # This file controls what Internet media types are sent to the client for
 # given file extension(s). Sending the correct media type to the client
 # is important so they know how to handle the content of the file.

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1356459&r1=1356458&r2=1356459&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon Jul  2 20:25:06 2012
@@ -1219,6 +1219,8 @@
               <exclude>src/test/resources/test-repo/**</exclude>
               <exclude>src/test/resources/**</exclude>
               <exclude>src/sql/**</exclude>
+              <exclude>src/test/repositories/test-repo/**</exclude>
+              <exclude>src/main/webapp/META-INF/MANIFEST.MF</exclude>
             </excludes>
           </configuration>
         </plugin>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld?rev=1356459&r1=1356458&r2=1356459&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld Mon Jul  2 20:25:06 2012
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd">
   <description><![CDATA[Archiva taglibs.]]></description>
   <display-name>Archiva Taglib</display-name>

Modified: archiva/trunk/archiva-modules/archiva-web/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/pom.xml?rev=1356459&r1=1356458&r2=1356459&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/pom.xml Mon Jul  2 20:25:06 2012
@@ -92,6 +92,7 @@
           <configuration>
             <excludes>
               <!-- for when the profile is not activated -->
+              <exclude>archiva-webapp-test-js/**</exclude>
               <exclude>archiva-webapp-test/**</exclude>
             </excludes>
           </configuration>

Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1356459&r1=1356458&r2=1356459&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Mon Jul  2 20:25:06 2012
@@ -1764,6 +1764,7 @@
               <exclude>*.sh</exclude>
               <exclude>.git/**</exclude>
               <exclude>src/test/resources/projects/compile/goal.txt</exclude>
+              <exclude>**/*.iml</exclude>
             </excludes>
           </configuration>
         </plugin>