Updated Branches: refs/heads/1.5.x 7250c7ec5 -> 3f14118eb
Fixing RAT check for 1.5.x Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/3f14118e Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/3f14118e Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/3f14118e Branch: refs/heads/1.5.x Commit: 3f14118eb6c7ce9878c9a51aa2e8443ce4d19228 Parents: 7250c7e Author: Andrew Bayer <[email protected]> Authored: Wed Jun 12 17:51:07 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Wed Jun 12 17:51:07 2013 -0700 ---------------------------------------------------------------------- .../src/test/resources/api-live.properties | 21 ++++++++++++++++ .../test/resources/filters/filters.properties | 23 ++++++++++++++++- .../filters/filters_jenkins.properties | 23 ++++++++++++++++- labs/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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/3f14118e/labs/abiquo/src/test/resources/api-live.properties ---------------------------------------------------------------------- diff --git a/labs/abiquo/src/test/resources/api-live.properties b/labs/abiquo/src/test/resources/api-live.properties index a452389..dfaa959 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} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/3f14118e/labs/abiquo/src/test/resources/filters/filters.properties ---------------------------------------------------------------------- diff --git a/labs/abiquo/src/test/resources/filters/filters.properties b/labs/abiquo/src/test/resources/filters/filters.properties index 8f434a8..c7302f1 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/3f14118e/labs/abiquo/src/test/resources/filters/filters_jenkins.properties ---------------------------------------------------------------------- diff --git a/labs/abiquo/src/test/resources/filters/filters_jenkins.properties b/labs/abiquo/src/test/resources/filters/filters_jenkins.properties index 071d53b..32563dc 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/3f14118e/labs/abiquo/src/test/resources/license/expired ---------------------------------------------------------------------- diff --git a/labs/abiquo/src/test/resources/license/expired b/labs/abiquo/src/test/resources/license/expired index 1db9f51..c73a711 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== http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/3f14118e/labs/virtualbox/src/main/resources/default-images.yaml ---------------------------------------------------------------------- diff --git a/labs/virtualbox/src/main/resources/default-images.yaml b/labs/virtualbox/src/main/resources/default-images.yaml index f4f584f..fa1fb1e 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/3f14118e/labs/virtualbox/src/test/resources/default-images.yaml ---------------------------------------------------------------------- diff --git a/labs/virtualbox/src/test/resources/default-images.yaml b/labs/virtualbox/src/test/resources/default-images.yaml index fddcff3..d83ca22 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/3f14118e/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index 496c36f..f5bcd19 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -358,6 +358,7 @@ <exclude>**/src/test/resources/**/*.txt</exclude> <exclude>**/src/test/resources/**/*.gz</exclude> <exclude>**/src/test/resources/**/*.xml</exclude> + <exclude>**/src/test/resources/**/*.iso</exclude> <!-- META-INF/services files --> <exclude>**/services/*LoggingModule</exclude>
