JCLOUDS-61. 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/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/commit/b59ea797 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/tree/b59ea797 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/diff/b59ea797 Branch: refs/heads/master Commit: b59ea797ed2d4a7cac81fc0c556c00900181fc5c Parents: 111022a Author: adriancole <[email protected]> Authored: Thu May 16 22:04:09 2013 -0700 Committer: adriancole <[email protected]> Committed: Thu May 16 23:00:48 2013 -0700 ---------------------------------------------------------------------- pom.xml | 155 +++++++++++++++++++++++++++++++++------------- src/etc/header.txt | 26 ++++---- 2 files changed, 123 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/b59ea797/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 67d667f..021b652 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";> @@ -86,7 +84,6 @@ under the License. <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.8</version> <inherited>false</inherited> <executions> <execution> @@ -99,32 +96,57 @@ under the License. <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> + + <!-- temporarily exclude shell script fragments --> + <exclude>**/*sh</exclude> + <exclude>**/*cmd</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> - <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>**/*ViewMBeanFactory</exclude> - <exclude>**/*ProviderMetadata</exclude> - <exclude>**/*ApiMetadata</exclude> - <exclude>**/src/test/resources/**/*</exclude> - <exclude>**/jaxb.index</exclude> - <exclude>**/*readme</exclude> - <exclude>.repository/**</exclude> - <!-- binary --> </excludes> </configuration> </plugin> @@ -138,20 +160,65 @@ under the License. <aggregate>true</aggregate> <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> + + <!-- temporarily exclude shell script fragments --> + <exclude>**/*sh</exclude> + <exclude>**/*cmd</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/blob/b59ea797/src/etc/header.txt ---------------------------------------------------------------------- diff --git a/src/etc/header.txt b/src/etc/header.txt index 71bd831..1745cfe 100644 --- a/src/etc/header.txt +++ b/src/etc/header.txt @@ -1,16 +1,14 @@ -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 +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.
