diff options
author | Olivier Lamy <olamy@apache.org> | 2012-07-02 20:25:06 +0000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2012-07-02 20:25:06 +0000 |
commit | a116e45603c19ef79ff946ea371bcb67493c43e6 (patch) | |
tree | ebe9c16d607fc38864515207c9a0c6fb783d4005 | |
parent | fc80546f5a246274e326226b58bb031af6cc2bdd (diff) | |
download | archiva-a116e45603c19ef79ff946ea371bcb67493c43e6.tar.gz archiva-a116e45603c19ef79ff946ea371bcb67493c43e6.zip |
fix some issues reported by rat check
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1356459 13f79535-47bb-0310-9956-ffa450edef68
6 files changed, 45 insertions, 0 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 26d0cc341..27d22cd51 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/archiva-mime-types.txt b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/archiva-mime-types.txt index 3f1e6a3b3..144f35ddc 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/archiva-mime-types.txt +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/archiva-mime-types.txt @@ -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. diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index db8bc144c..dcca9982b 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld index 1006dd1ba..335c6325a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tld/web-tags.tld @@ -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> diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index 8aceb9bda..0d26bfe79 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -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> @@ -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> |