From fc80546f5a246274e326226b58bb031af6cc2bdd Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 2 Jul 2012 20:24:41 +0000 Subject: [PATCH] fix some issues reported by rat check git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1356458 13f79535-47bb-0310-9956-ffa450edef68 --- .../resources/archetype-resources/pom.xml | 25 +++++++++++++++++++ .../src/main/java/SimpleArtifactConsumer.java | 19 ++++++++++++++ .../projects/compile/archetype.properties | 19 ++++++++++++++ .../src/test/test-settings.xml | 20 +++++++++++++++ pom.xml | 1 + 5 files changed, 84 insertions(+) diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml index 5616e8bfb..ad89b962b 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml @@ -1,3 +1,23 @@ + + + @@ -164,6 +184,11 @@ ${wagonVersion} test + + xerces + xercesImpl + 2.8.1 + diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java index 3fc27507c..0e206accb 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java @@ -1,5 +1,24 @@ package $package; +/* + * 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. + */ + import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties index 47890f0fd..6b0544b1a 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties @@ -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. +# + groupId=org.apache.archiva.consumer.its.compile artifactId=simple-consumer-compile version=1.0-SNAPSHOT diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/test-settings.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/test-settings.xml index c8dc6ec07..eb87854f5 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/test-settings.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/test-settings.xml @@ -47,6 +47,26 @@ under the License. true + + apache.snapshots + @localRepositoryUrl@ + + true + + + true + + + + archiva.snapshots + @localRepositoryUrl@ + + true + + + true + + diff --git a/pom.xml b/pom.xml index c247be181..bbe5ba73d 100644 --- a/pom.xml +++ b/pom.xml @@ -1763,6 +1763,7 @@ README.txt *.sh .git/** + src/test/resources/projects/compile/goal.txt -- 2.39.5