You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2013/05/17 07:57:27 UTC
[7/9] git commit: JCLOUDS-63. adjust license plugin and header file
to ASF license scheme; change java to comment style; include maven pom.xml
JCLOUDS-63. adjust license plugin and header file to ASF license scheme; change java to comment style; include maven pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/commit/bcb854d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/tree/bcb854d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/diff/bcb854d4
Branch: refs/heads/master
Commit: bcb854d48ba752f0079d2f51d463d65a975aaf21
Parents: 2c86b8e
Author: adriancole <ad...@gmail.com>
Authored: Thu May 16 22:23:44 2013 -0700
Committer: adriancole <ad...@gmail.com>
Committed: Thu May 16 22:56:33 2013 -0700
----------------------------------------------------------------------
pom.xml | 145 ++++++++++++++++++++++++++++++++++-------------
src/etc/header.txt | 14 +++++
2 files changed, 120 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/bcb854d4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c0ae46d..d564c60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,22 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-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.
+ 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -80,7 +78,6 @@ under the License.
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
<inherited>false</inherited>
<executions>
<execution>
@@ -91,26 +88,55 @@ under the License.
</execution>
</executions>
<configuration>
+ <excludeSubProjects>false</excludeSubProjects>
<excludes>
+ <!-- expectation files for unit tests -->
+ <exclude>**/src/test/resources/**</exclude>
+
+ <!-- prevent duplicating license -->
+ <exclude>**/LICENSE.txt</exclude>
+ <exclude>**/header.txt</exclude>
+
+ <!-- high-level project metadata -->
+ <exclude>**/NOTICE.txt</exclude>
+ <exclude>**/DISCLAIMER</exclude>
<exclude>**/BUILD.txt</exclude>
<exclude>**/CHANGES.txt</exclude>
- <exclude>**/NOTICE-src.txt</exclude>
<exclude>**/README.md</exclude>
+ <exclude>**/README.txt</exclude>
+
+ <!-- reference data lists -->
+ <exclude>**/*json</exclude>
+ <exclude>**/*readme</exclude>
+
+ <!-- one-line service registry files -->
+ <exclude>**/*ProviderMetadata</exclude>
+ <exclude>**/*ApiMetadata</exclude>
+ <exclude>**/*LoggingModule</exclude>
+ <exclude>**/*ViewMBeanFactory</exclude>
+
+ <!-- temporary files or those generated by IDE or SCM -->
+ <exclude>**/target/**</exclude>
+ <exclude>**/test-output/**</exclude>
+ <exclude>**/bin/**</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.dir-locals.el</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.eml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.DS_STORE</exclude>
+ <exclude>**/TAGS</exclude>
+ <exclude>**/.metadata/**</exclude>
+ <exclude>**/atlassian-ide-plugin.xml</exclude>
+ <exclude>**/.DS_Store</exclude>
+ <exclude>.mailmap</exclude>
<exclude>.git/**</exclude>
<exclude>**/.gitignore</exclude>
- <exclude>**/*.json</exclude>
- <exclude>**/*.log*</exclude>
- <exclude>**/TODO</exclude>
- <exclude>.mailmap</exclude>
- <exclude>.idea/**</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/.checkstyle</exclude>
- <exclude>**/target/**</exclude>
- <exclude>.repository/**</exclude>
- <!-- binary -->
+ <exclude>**/.gitattributes</exclude>
</excludes>
</configuration>
</plugin>
@@ -122,22 +148,63 @@ under the License.
<strictCheck>true</strictCheck>
<encoding>${sourceEncoding}</encoding>
<aggregate>true</aggregate>
- <header>project/src/etc/header.txt</header>
+ <header>src/etc/header.txt</header>
<mapping>
- <clj>SEMICOLON_STYLE</clj>
+ <xml>XML_STYLE</xml>
+ <java>SLASHSTAR_STYLE</java>
+ <clj>SEMICOLON_STYLE</clj>
+ <index>SCRIPT_STYLE</index>
</mapping>
<excludes>
- <exclude>**/src/**/resources/**</exclude>
+ <!-- expectation files for unit tests -->
+ <exclude>**/src/test/resources/**</exclude>
+
+ <!-- prevent duplicating license -->
<exclude>**/LICENSE.txt</exclude>
+ <exclude>**/header.txt</exclude>
+
+ <!-- high-level project metadata -->
<exclude>**/NOTICE.txt</exclude>
+ <exclude>**/DISCLAIMER</exclude>
+ <exclude>**/BUILD.txt</exclude>
+ <exclude>**/CHANGES.txt</exclude>
<exclude>**/README.md</exclude>
<exclude>**/README.txt</exclude>
- <exclude>**/header.txt</exclude>
+
+ <!-- reference data lists -->
+ <exclude>**/*json</exclude>
+ <exclude>**/*readme</exclude>
+
+ <!-- one-line service registry files -->
+ <exclude>**/*ProviderMetadata</exclude>
+ <exclude>**/*ApiMetadata</exclude>
+ <exclude>**/*LoggingModule</exclude>
+ <exclude>**/*ViewMBeanFactory</exclude>
+
+ <!-- temporary files or those generated by IDE or SCM -->
+ <exclude>**/target/**</exclude>
+ <exclude>**/test-output/**</exclude>
+ <exclude>**/bin/**</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.dir-locals.el</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.eml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.DS_STORE</exclude>
+ <exclude>**/TAGS</exclude>
+ <exclude>**/.metadata/**</exclude>
+ <exclude>**/atlassian-ide-plugin.xml</exclude>
+ <exclude>**/.DS_Store</exclude>
+ <exclude>.mailmap</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**/.gitattributes</exclude>
</excludes>
- <properties>
- <year>2011</year>
- <copyrightHolder>jclouds, Inc.</copyrightHolder>
- </properties>
+ <useDefaultExcludes>false</useDefaultExcludes>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/bcb854d4/src/etc/header.txt
----------------------------------------------------------------------
diff --git a/src/etc/header.txt b/src/etc/header.txt
new file mode 100644
index 0000000..1745cfe
--- /dev/null
+++ b/src/etc/header.txt
@@ -0,0 +1,14 @@
+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.