Updated Branches: refs/heads/master cff2fdbcf -> 5c1be231d
JCLOUDS-80. Inherit apache-rat plugin config. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/commit/5c1be231 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/tree/5c1be231 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/diff/5c1be231 Branch: refs/heads/master Commit: 5c1be231df4cc54281776688c1ebaabeab12fcbb Parents: cff2fdb Author: Andrew Bayer <[email protected]> Authored: Wed May 22 10:29:56 2013 -0400 Committer: Andrew Bayer <[email protected]> Committed: Wed May 22 10:29:56 2013 -0400 ---------------------------------------------------------------------- .../GoogleComputeEngineTemplateOptions.java | 19 ++++++++++++++ .../UseNodeCredentialsButOverrideFromTemplate.java | 19 ++++++++++++++ .../META-INF/services/org.jclouds.apis.ApiMetadata | 17 ++++++++++++ .../src/test/resources/logback.xml | 20 +++++++++++++++ .../META-INF/services/org.jclouds.apis.ApiMetadata | 17 ++++++++++++ oauth/src/test/resources/logback.xml | 20 +++++++++++++++ pom.xml | 1 - 7 files changed, 112 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/5c1be231/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java index cf3dea5..ef11257 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java @@ -1,3 +1,22 @@ +/** + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds 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. + */ + package org.jclouds.googlecomputeengine.compute.options; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/5c1be231/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/UseNodeCredentialsButOverrideFromTemplate.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/UseNodeCredentialsButOverrideFromTemplate.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/UseNodeCredentialsButOverrideFromTemplate.java index 29d216f..ab3756f 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/UseNodeCredentialsButOverrideFromTemplate.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/UseNodeCredentialsButOverrideFromTemplate.java @@ -1,3 +1,22 @@ +/** + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds 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. + */ + package org.jclouds.googlecomputeengine.compute.strategy; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/5c1be231/google-compute-engine/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/google-compute-engine/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata index 00c6b8a..6b79dce 100644 --- a/google-compute-engine/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ b/google-compute-engine/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata @@ -1 +1,18 @@ +# +# 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. +# + org.jclouds.googlecomputeengine.GoogleComputeEngineApiMetadata http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/5c1be231/google-compute-engine/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/logback.xml b/google-compute-engine/src/test/resources/logback.xml index dd4223c..43f2f8a 100644 --- a/google-compute-engine/src/test/resources/logback.xml +++ b/google-compute-engine/src/test/resources/logback.xml @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + +Licensed to jclouds, Inc. (jclouds) under one or more +contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. jclouds 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. + +--> <configuration scan="false"> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> <file>target/test-data/jclouds.log</file> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/5c1be231/oauth/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata ---------------------------------------------------------------------- diff --git a/oauth/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/oauth/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata index d5a96e4..d7064de 100644 --- a/oauth/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ b/oauth/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata @@ -1 +1,18 @@ +# +# 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. +# + org.jclouds.oauth.v2.OAuthApiMetadata http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/5c1be231/oauth/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/oauth/src/test/resources/logback.xml b/oauth/src/test/resources/logback.xml index 9679b2e..385a383 100644 --- a/oauth/src/test/resources/logback.xml +++ b/oauth/src/test/resources/logback.xml @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + +Licensed to jclouds, Inc. (jclouds) under one or more +contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. jclouds 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. + +--> <configuration scan="false"> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> <file>target/test-data/jclouds.log</file> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-google/blob/5c1be231/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index aab9e4d..206f79a 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,6 @@ under the License. <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <version>0.8</version> - <inherited>false</inherited> <executions> <execution> <phase>package</phase>
