brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [5/9] git commit: Explain rat exclusions for licence headers
Date Sat, 11 Oct 2014 13:04:38 GMT
Explain rat exclusions for licence headers

- and add license header to a few more files


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5c19a348
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5c19a348
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5c19a348

Branch: refs/heads/master
Commit: 5c19a3489d736788d4c8d24558485f062c58d5b2
Parents: 8a3a265
Author: Aled Sage <aled.sage@gmail.com>
Authored: Wed Oct 8 21:12:33 2014 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Fri Oct 10 16:28:58 2014 +0100

----------------------------------------------------------------------
 software/nosql/pom.xml                          | 21 ++++++++++++++------
 .../nosql/src/test/resources/solr/example.txt   | 17 ++++++++++++++++
 software/osgi/pom.xml                           |  7 +++++++
 usage/cli/pom.xml                               |  5 +++++
 usage/jsgui/pom.xml                             | 11 +++++++++-
 usage/jsgui/src/test/javascript/config.txt      | 18 +++++++++++++++++
 usage/qa/log-exclusions.txt                     | 17 ++++++++++++++++
 usage/qa/pom.xml                                | 13 ------------
 8 files changed, 89 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c19a348/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index f5df999..0e4b41e 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -230,13 +230,22 @@
                 <exclude>src/main/resources/brooklyn/entity/nosql/riak/vm.args</exclude>
                 <exclude>src/main/resources/brooklyn/entity/nosql/solr/solr.xml</exclude>
 
-                <!-- TODO explain! -->
-                <exclude>**/*.txt</exclude>
-
-                <!-- TODO explain why exclude src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar
-->
+                <!--
+                    The source code for cassandra-multicloud-snitch.jar is in sandbox/cassandra-multicloud-snitch.
+                    This snitch handles Cassandra datacenters in different cloud providers.
+                    The source will be contributed to the Cassandra project; when it is available
in the 
+                    Cassandra distro (and when we don't want to give backwards compatibility
support for
+                    older Cassandra versions), then we can delete it from Brooklyn.
+                -->
+                <exclude>**/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar</exclude>
 
-                <!-- In theory, binary files should be excluded, but for reasons unknown
the example.tgz was being picked up as non-binary -->
-                <exclude>**/*.tgz</exclude>
+                <!--
+                    This is a trivial Solr example, used for testing that a simple definition
is deployed
+                    correctly. It is "without any degree of creativity". It is stored as
a binary tgz, rather
+                    than us generating the tgz as part of the build, to keep the build process
and testing 
+                    simpler.
+                -->
+                <exclude>**/src/test/resources/solr/example.tgz</exclude>
               </excludes>
             </configuration>
           </plugin>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c19a348/software/nosql/src/test/resources/solr/example.txt
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/resources/solr/example.txt b/software/nosql/src/test/resources/solr/example.txt
index b19d0ef..4e15549 100644
--- a/software/nosql/src/test/resources/solr/example.txt
+++ b/software/nosql/src/test/resources/solr/example.txt
@@ -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.
+
 The example tarball in this directory consists simply of the source files in this directory.
It is included as a (tiny) binary to prevent build complication when aggregating them for
upload to remote servers.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c19a348/software/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/software/osgi/pom.xml b/software/osgi/pom.xml
index 3285c84..d13efb4 100644
--- a/software/osgi/pom.xml
+++ b/software/osgi/pom.xml
@@ -114,6 +114,13 @@
                     <artifactId>apache-rat-plugin</artifactId>
                     <configuration>
                         <excludes combine.children="append">
+                            <!--
+                                Java code that is copyright OSGi Alliance. It is included
in NOTICE.
+                                As the comment at the top of the Java files says:
+                                "BROOKLYN NOTE: This is a verbatim copy of the original in
org.osgi.enterprise-4.2.0, 
+                                 reproduced here to avoid pulling in the rest of that bundle
and its chain of dependencies.
+                                 The only difference is this comment and the suppress warnings."
+                            -->
                             <exclude>**/src/main/java/org/osgi/jmx/*</exclude>
                         </excludes>
                     </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c19a348/usage/cli/pom.xml
----------------------------------------------------------------------
diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml
index 70bea6f..ea7fa26 100644
--- a/usage/cli/pom.xml
+++ b/usage/cli/pom.xml
@@ -131,6 +131,11 @@
                     <artifactId>apache-rat-plugin</artifactId>
                     <configuration>
                         <excludes combine.children="append">
+                            <!--
+                                bloodhound.js is copyright Twitter, Inc. It is included in
NOTICE.
+                                It is used by the HTML generated by the CLI tool for entity
descriptions,
+                                i.e. by brooklyn.cli.itemlister.ItemLister
+                            -->
                             <exclude>**/src/main/resources/libs/js/bloodhound.js</exclude>
                         </excludes>
                     </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c19a348/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 11c3514..598ee61 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -233,9 +233,18 @@
                     <artifactId>apache-rat-plugin</artifactId>
                     <configuration>
                         <excludes combine.children="append">
+                            <!--
+                                JavaScript code that is not copyright of Apache Foundation.
It is included in NOTICE.
+                            -->
                             <exclude>**/src/main/webapp/assets/js/libs/*</exclude>
                             <exclude>**/src/build/requirejs-maven-plugin/r.js</exclude>
-                            <exclude>**/src/test/javascript/config.txt</exclude>
+
+                            <!--
+                                Trivial Json controlling the build,  "without any degree
of creativity".
+                                Json does not support comments, therefore far easier to just
omit the license header!
+                            -->
+                            <exclude>**//src/build/optimize-css.json</exclude>
+                            <exclude>**//src/build/optimize-js.json</exclude>
                         </excludes>
                     </configuration>
                 </plugin>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c19a348/usage/jsgui/src/test/javascript/config.txt
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/javascript/config.txt b/usage/jsgui/src/test/javascript/config.txt
index ba4d4ec..6681acd 100644
--- a/usage/jsgui/src/test/javascript/config.txt
+++ b/usage/jsgui/src/test/javascript/config.txt
@@ -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.
+     */
 
     /* Custom configuration for Jasmine tests. */
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c19a348/usage/qa/log-exclusions.txt
----------------------------------------------------------------------
diff --git a/usage/qa/log-exclusions.txt b/usage/qa/log-exclusions.txt
index 42d2437..8c9252e 100644
--- a/usage/qa/log-exclusions.txt
+++ b/usage/qa/log-exclusions.txt
@@ -1,2 +1,19 @@
+# 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.
+
 GrailsUtil.*is deprecated please use
 echo.*WARNING

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c19a348/usage/qa/pom.xml
----------------------------------------------------------------------
diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml
index 2142ce0..e236eed 100644
--- a/usage/qa/pom.xml
+++ b/usage/qa/pom.xml
@@ -98,19 +98,6 @@
                     </executions>
             </plugin>
         </plugins>
-      <pluginManagement>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.rat</groupId>
-            <artifactId>apache-rat-plugin</artifactId>
-            <configuration>
-              <excludes combine.children="append">
-                <exclude>**/log-exclusions.txt</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </pluginManagement>
     </build> 
 </project>
 


Mime
View raw message