You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by bs...@apache.org on 2018/09/25 21:39:30 UTC

[incubator-druid] branch master updated: Move the Rat plugin to a separate Maven profile (#6376)

This is an automated email from the ASF dual-hosted git repository.

bslim pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git


The following commit(s) were added to refs/heads/master by this push:
     new 4afa85e  Move the Rat plugin to a separate Maven profile (#6376)
4afa85e is described below

commit 4afa85e4e8e1c1b08d8bacc92b1c9de1faddbf25
Author: Roman Leventov <le...@gmail.com>
AuthorDate: Wed Sep 26 00:39:24 2018 +0300

    Move the Rat plugin to a separate Maven profile (#6376)
    
    * Move the Rat plugin to a separate Maven profile
    
    * Revert self-check
---
 .travis.yml |   6 ++
 pom.xml     | 208 ++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 116 insertions(+), 98 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8750ca4..7006567 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,12 @@ cache:
 
 matrix:
   include:
+      # license checks
+    - env:
+       - NAME="license checks"
+      install: true
+      script: MAVEN_OPTS='-Xmx3000m' mvn clean verify -Prat -DskipTests
+
       # strict compilation
     - env:
         - NAME="strict compilation"
diff --git a/pom.xml b/pom.xml
index ec3e593..c576759 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1016,104 +1016,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <version>0.12</version>
-                <executions>
-                    <execution>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <outputDirectory>${project.basedir}/rat</outputDirectory>
-                    <licenses>
-                        <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
-                            <licenseFamilyCategory>MIT</licenseFamilyCategory>
-                            <licenseFamilyName>MIT JQyery</licenseFamilyName>
-                            <notes></notes>
-                            <patterns>
-                                <pattern>Copyright 2012 jQuery Foundation and other contributors; Licensed MIT</pattern>
-                                <pattern>jQuery Foundation, Inc. | jquery.org/license</pattern>
-                            </patterns>
-                        </license>
-                        <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
-                            <licenseFamilyCategory>Underscore</licenseFamilyCategory>
-                            <licenseFamilyName>Underscore</licenseFamilyName>
-                            <notes></notes>
-                            <patterns>
-                                <pattern>Underscore is freely distributable under the MIT license</pattern>
-                            </patterns>
-                        </license>
-                        <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
-                            <licenseFamilyCategory>Allan Jardine</licenseFamilyCategory>
-                            <licenseFamilyName>Allan Jardine</licenseFamilyName>
-                            <notes></notes>
-                            <patterns>
-                                <pattern>Copyright 2009 Allan Jardine. All Rights Reserved</pattern>
-                            </patterns>
-                        </license>
-                        <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
-                            <licenseFamilyCategory>Allan Jardine</licenseFamilyCategory>
-                            <licenseFamilyName>Allan Jardine</licenseFamilyName>
-                            <notes></notes>
-                            <patterns>
-                                <pattern>Copyright 2009 Allan Jardine. All Rights Reserved</pattern>
-                                <pattern>Copyright 2008-2011 Allan Jardine</pattern>
-                                <pattern>GPL v2 or BSD 3 point style</pattern>
-                            </patterns>
-                        </license>
-                    </licenses>
-
-                    <licenseFamilies>
-                        <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
-                            <familyName>MIT JQyery</familyName>
-                        </licenseFamily>
-                        <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
-                            <familyName>Underscore</familyName>
-                        </licenseFamily>
-                        <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
-                            <familyName>Allan Jardine</familyName>
-                        </licenseFamily>
-                    </licenseFamilies>
-                    <excludes>
-                        <!--DOCS-->
-                        <exclude>**/*.md</exclude>
-                        <exclude>publications/**</exclude>
-                        <exclude>docs/**</exclude>
-                        <!--CODE STYLE-->
-                        <exclude>codestyle/*</exclude>
-                        <exclude>eclipse.importorder</exclude>
-                        <!--CODE RESOURCES-->
-                        <exclude>**/javax.annotation.processing.Processor</exclude>
-                        <exclude>**/org.apache.druid.initialization.DruidModule</exclude>
-                        <exclude>**/org/apache/druid/math/expr/antlr/Expr.g4</exclude>
-                        <exclude>**/dependency-reduced-pom.xml</exclude>
-                        <!--BUILD and TESTS-->
-                        <exclude>**/target/**</exclude>
-                        <exclude>**/build/**</exclude>
-                        <exclude>**/test/resources/**</exclude>
-                        <exclude>**/src/test/avro/**</exclude>
-                        <exclude>**/src/test/thrift/**</exclude>
-                        <exclude>.travis.yml</exclude>
-                        <!--DEV and IT-TESTS-->
-                        <exclude>**/*.json</exclude>
-                        <exclude>**/jvm.config</exclude>
-                        <exclude>**/quickstart/protobuf/**</exclude>
-                        <exclude>**/tutorial/conf/**</exclude>
-                        <exclude>**/derby.log</exclude>
-                        <exclude>**/docker/**</exclude>
-                        <exclude>**/client_tls/**</exclude>
-                        <!--IDE MODULE FILES-->
-                        <exclude>**/*.iml</exclude>
-                        <!--CRASH LOGS-->
-                        <exclude>**/hs_err_pid*.log</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -1366,5 +1268,115 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <!-- Run Apache Rat license checks in a separate profile, because during local builds it doesn't skip files
+            that are not checked into Git -->
+            <id>rat</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.rat</groupId>
+                        <artifactId>apache-rat-plugin</artifactId>
+                        <version>0.12</version>
+                        <executions>
+                            <execution>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <outputDirectory>${project.basedir}/rat</outputDirectory>
+                            <licenses>
+                                <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+                                    <licenseFamilyCategory>MIT</licenseFamilyCategory>
+                                    <licenseFamilyName>MIT JQyery</licenseFamilyName>
+                                    <notes></notes>
+                                    <patterns>
+                                        <pattern>Copyright 2012 jQuery Foundation and other contributors; Licensed MIT</pattern>
+                                        <pattern>jQuery Foundation, Inc. | jquery.org/license</pattern>
+                                    </patterns>
+                                </license>
+                                <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+                                    <licenseFamilyCategory>Underscore</licenseFamilyCategory>
+                                    <licenseFamilyName>Underscore</licenseFamilyName>
+                                    <notes></notes>
+                                    <patterns>
+                                        <pattern>Underscore is freely distributable under the MIT license</pattern>
+                                    </patterns>
+                                </license>
+                                <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+                                    <licenseFamilyCategory>Allan Jardine</licenseFamilyCategory>
+                                    <licenseFamilyName>Allan Jardine</licenseFamilyName>
+                                    <notes></notes>
+                                    <patterns>
+                                        <pattern>Copyright 2009 Allan Jardine. All Rights Reserved</pattern>
+                                    </patterns>
+                                </license>
+                                <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+                                    <licenseFamilyCategory>Allan Jardine</licenseFamilyCategory>
+                                    <licenseFamilyName>Allan Jardine</licenseFamilyName>
+                                    <notes></notes>
+                                    <patterns>
+                                        <pattern>Copyright 2009 Allan Jardine. All Rights Reserved</pattern>
+                                        <pattern>Copyright 2008-2011 Allan Jardine</pattern>
+                                        <pattern>GPL v2 or BSD 3 point style</pattern>
+                                    </patterns>
+                                </license>
+                            </licenses>
+
+                            <licenseFamilies>
+                                <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+                                    <familyName>MIT JQyery</familyName>
+                                </licenseFamily>
+                                <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+                                    <familyName>Underscore</familyName>
+                                </licenseFamily>
+                                <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+                                    <familyName>Allan Jardine</familyName>
+                                </licenseFamily>
+                            </licenseFamilies>
+                            <excludes>
+                                <!--DOCS-->
+                                <exclude>**/*.md</exclude>
+                                <exclude>publications/**</exclude>
+                                <exclude>docs/**</exclude>
+                                <!--CODE STYLE-->
+                                <exclude>codestyle/*</exclude>
+                                <exclude>eclipse.importorder</exclude>
+                                <!--CODE RESOURCES-->
+                                <exclude>**/javax.annotation.processing.Processor</exclude>
+                                <exclude>**/org.apache.druid.initialization.DruidModule</exclude>
+                                <exclude>**/org/apache/druid/math/expr/antlr/Expr.g4</exclude>
+                                <exclude>**/dependency-reduced-pom.xml</exclude>
+                                <!--BUILD and TESTS-->
+                                <exclude>**/target/**</exclude>
+                                <exclude>**/build/**</exclude>
+                                <exclude>**/test/resources/**</exclude>
+                                <exclude>**/src/test/avro/**</exclude>
+                                <exclude>**/src/test/thrift/**</exclude>
+                                <exclude>.travis.yml</exclude>
+                                <!--DEV and IT-TESTS-->
+                                <exclude>**/*.json</exclude>
+                                <exclude>**/jvm.config</exclude>
+                                <exclude>**/quickstart/protobuf/**</exclude>
+                                <exclude>**/tutorial/conf/**</exclude>
+                                <exclude>**/derby.log</exclude>
+                                <exclude>**/docker/**</exclude>
+                                <exclude>**/client_tls/**</exclude>
+                                <!--IDE MODULE FILES-->
+                                <exclude>**/*.iml</exclude>
+                                <!--CRASH LOGS-->
+                                <exclude>**/hs_err_pid*.log</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org