From 3f14118eb6c7ce9878c9a51aa2e8443ce4d19228 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 12 Jun 2013 17:51:07 -0700 Subject: [PATCH] Fixing RAT check for 1.5.x --- .../src/test/resources/api-live.properties | 21 +++++++++++++++ .../test/resources/filters/filters.properties | 23 +++++++++++++++- .../filters/filters_jenkins.properties | 23 +++++++++++++++- .../abiquo/src/test/resources/license/expired | 22 +++++++++++++++- .../src/main/resources/default-images.yaml | 26 ++++++++++--------- .../src/test/resources/default-images.yaml | 20 +++++++++++++- project/pom.xml | 1 + 7 files changed, 120 insertions(+), 16 deletions(-) diff --git a/labs/abiquo/src/test/resources/api-live.properties b/labs/abiquo/src/test/resources/api-live.properties index a452389f85..dfaa959b5e 100644 --- a/labs/abiquo/src/test/resources/api-live.properties +++ b/labs/abiquo/src/test/resources/api-live.properties @@ -1,3 +1,24 @@ +# +# +# 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. +# +# + # Hypervisor configuration abiquo.hypervisor.type = ${abiquo.hypervisor.type} abiquo.hypervisor.address = ${abiquo.hypervisor.address} diff --git a/labs/abiquo/src/test/resources/filters/filters.properties b/labs/abiquo/src/test/resources/filters/filters.properties index 8f434a8b80..c7302f1b20 100644 --- a/labs/abiquo/src/test/resources/filters/filters.properties +++ b/labs/abiquo/src/test/resources/filters/filters.properties @@ -1,3 +1,24 @@ +# +# +# 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. +# +# + # Hypervisor configuration # This is the Tarantino IT hypervisor. # Should be replaced with a dedicated ESX asap! @@ -23,4 +44,4 @@ abiquo.storage.pool=abiquo abiquo.ucs.address=10.60.1.45 abiquo.ucs.port=80 abiquo.ucs.pass=config -abiquo.ucs.user=config \ No newline at end of file +abiquo.ucs.user=config diff --git a/labs/abiquo/src/test/resources/filters/filters_jenkins.properties b/labs/abiquo/src/test/resources/filters/filters_jenkins.properties index 071d53b99a..32563dc874 100644 --- a/labs/abiquo/src/test/resources/filters/filters_jenkins.properties +++ b/labs/abiquo/src/test/resources/filters/filters_jenkins.properties @@ -1,3 +1,24 @@ +# +# +# 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. +# +# + # Hypervisor configuration # This is the Tarantino IT hypervisor. # Should be replaced with a dedicated ESX asap! @@ -23,4 +44,4 @@ abiquo.storage.pool=abiquo abiquo.ucs.address=10.60.1.45 abiquo.ucs.port=80 abiquo.ucs.pass=config -abiquo.ucs.user=config \ No newline at end of file +abiquo.ucs.user=config diff --git a/labs/abiquo/src/test/resources/license/expired b/labs/abiquo/src/test/resources/license/expired index 1db9f513ae..c73a711a50 100644 --- a/labs/abiquo/src/test/resources/license/expired +++ b/labs/abiquo/src/test/resources/license/expired @@ -1 +1,21 @@ -B9cG06GaLHhUlpD9AWxKVkZPd4qPB0OAbm2Blr4374Y6rtPhcukg4MMLNK0uWn5fnsoBSqVX8o0hwQ1I6D3zUbFBSibMaK5xIZQfZmReHf04HPPBg0ZyaPRTBoKy6dCLnWpQIKe8vLemAudZ0w4spdzYMH2jw2TImN+2vd4QDU1qmUItYMsV5Sz+e8YVEGbUVkjRjQCmIUJskVxC+sW47dokgl5Qo8hN+4I6vKgEnXFdOSRFW2cyGgpHVH4Js4hwLG+PS2LXPS4UwvISJXRF6tO7Rgg9iaObcBD/byH5jGmggtSECUtXqI70nesIbMXRHQ1aGHARqbHH3+0Znjcu5g== \ No newline at end of file +# +# +# 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. +# +# +B9cG06GaLHhUlpD9AWxKVkZPd4qPB0OAbm2Blr4374Y6rtPhcukg4MMLNK0uWn5fnsoBSqVX8o0hwQ1I6D3zUbFBSibMaK5xIZQfZmReHf04HPPBg0ZyaPRTBoKy6dCLnWpQIKe8vLemAudZ0w4spdzYMH2jw2TImN+2vd4QDU1qmUItYMsV5Sz+e8YVEGbUVkjRjQCmIUJskVxC+sW47dokgl5Qo8hN+4I6vKgEnXFdOSRFW2cyGgpHVH4Js4hwLG+PS2LXPS4UwvISJXRF6tO7Rgg9iaObcBD/byH5jGmggtSECUtXqI70nesIbMXRHQ1aGHARqbHH3+0Znjcu5g== diff --git a/labs/virtualbox/src/main/resources/default-images.yaml b/labs/virtualbox/src/main/resources/default-images.yaml index f4f584f947..fa1fb1ed82 100644 --- a/labs/virtualbox/src/main/resources/default-images.yaml +++ b/labs/virtualbox/src/main/resources/default-images.yaml @@ -1,18 +1,20 @@ # -# 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 +# 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 +# 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. +# 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. # images: - id: ubuntu-11.04-i386 diff --git a/labs/virtualbox/src/test/resources/default-images.yaml b/labs/virtualbox/src/test/resources/default-images.yaml index fddcff3c4a..d83ca2261a 100644 --- a/labs/virtualbox/src/test/resources/default-images.yaml +++ b/labs/virtualbox/src/test/resources/default-images.yaml @@ -1,3 +1,21 @@ +# +# 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. +# images: - id: ubuntu-11.04-i386 name: ubuntu-11.04-server-i386 @@ -218,4 +236,4 @@ images: #choose-mirror-bin mirror/http/directory string /ubuntu #choose-mirror-bin mirror/suite select maverick #d-i debian-installer/allow_unauthenticated string true - choose-mirror-bin mirror/http/proxy string \ No newline at end of file + choose-mirror-bin mirror/http/proxy string diff --git a/project/pom.xml b/project/pom.xml index 496c36f864..f5bcd19b82 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -358,6 +358,7 @@ **/src/test/resources/**/*.txt **/src/test/resources/**/*.gz **/src/test/resources/**/*.xml + **/src/test/resources/**/*.iso **/services/*LoggingModule