You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2015/06/25 15:29:41 UTC
[1/2] incubator-groovy git commit: use gradle rat plugin instead of
java exec integration
Repository: incubator-groovy
Updated Branches:
refs/heads/GROOVY_2_4_X 4ca482d76 -> a8f5e00fa
use gradle rat plugin instead of java exec integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/291c2b5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/291c2b5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/291c2b5a
Branch: refs/heads/GROOVY_2_4_X
Commit: 291c2b5acebf99696a759fcb48117966b2eff7ad
Parents: 4ca482d
Author: paulk <pa...@asert.com.au>
Authored: Thu Jun 25 22:55:37 2015 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Thu Jun 25 23:28:07 2015 +1000
----------------------------------------------------------------------
build.gradle | 4 +++
config/licensing/rat-excludes.txt | 19 ----------
gradle/quality.gradle | 38 +++++++++++---------
.../org.codehaus.groovy.runtime.ExtensionModule | 14 ++++++++
4 files changed, 40 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/291c2b5a/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 7facdda..3c2e474 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,6 +27,9 @@ buildscript {
name 'Bintray Javadoc Hotfix repo'
url 'http://dl.bintray.com/melix/gradle-javadoc-hotfix-plugin'
}
+ maven {
+ url "https://plugins.gradle.org/m2/"
+ }
}
dependencies {
@@ -35,6 +38,7 @@ buildscript {
classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1'
//classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.1'
//classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
+ classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.1.2"
}
}
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/291c2b5a/config/licensing/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/config/licensing/rat-excludes.txt b/config/licensing/rat-excludes.txt
deleted file mode 100644
index 3f865b9..0000000
--- a/config/licensing/rat-excludes.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-rat-excludes\.txt
-rat\.out
-\.gitignore
-\.git
-\.gradle
-target
-benchmark
-licenses
-tmp
-\.classpath
-\.project
-build
-.*\.ipr
-.*\.iml
-.*\.iws
-gradlew
-assets
-gradlew\.bat
-.*\.adoc
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/291c2b5a/gradle/quality.gradle
----------------------------------------------------------------------
diff --git a/gradle/quality.gradle b/gradle/quality.gradle
index 579c90e..94b861a 100644
--- a/gradle/quality.gradle
+++ b/gradle/quality.gradle
@@ -21,6 +21,7 @@ import groovy.text.markup.TemplateConfiguration
allprojects {
+ apply plugin: "org.nosphere.apache.rat"
//apply plugin: "com.github.hierynomus.license"
apply plugin: 'checkstyle'
apply plugin: 'codenarc'
@@ -118,26 +119,31 @@ allprojects {
finalizedBy "${name}Report"
}
-}
+ findbugs {
+ // continue build despite findbug warnings
+ ignoreFailures = true
+ sourceSets = [sourceSets.main]
+ }
+ tasks.withType(FindBugs) {
+ effort = 'max'
+ reports {
+ xml.enabled = false
+ html.enabled = true
+ }
+ }
-configurations {
rat
-}
+ // Input directory, defaults to the project's root directory
+ inputDir = project.file( 'src' )
-dependencies {
- rat 'org.apache.rat:apache-rat-tasks:0.11'
-}
+ // XML and HTML reports directory, defaults to 'build/reports/rat'
+ reportDir = project.file( "$buildDir/reports/rat" )
+
+ // List of exclude directives, defaults to none
+ excludes = [ '**/target/**', '**/.gradle/**', '**/assets/**', '**/*.adoc' ]
-// Standalone rat task - suitable for manually checking license info
-// TODO replace with rat gradle plugin to allow per subproject checking and better exclusion/license specification
-String ratExcludesFilePath = 'config/licensing/rat-excludes.txt'
-task rat(type: JavaExec) {
- main = 'org.apache.rat.Report'
- classpath = files(configurations.rat)
- args = ['-E', ratExcludesFilePath, '--dir', '.']
- doFirst {
- println "Running Apache RAT. Exclusions are defined in: $ratExcludesFilePath"
- println "Using the following exclusions:\n${new File(ratExcludesFilePath).text}"
+ // Fail the build on rat errors, defaults to true
+ failOnError = false
}
}
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/291c2b5a/src/test-fixtures/extmodule/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
----------------------------------------------------------------------
diff --git a/src/test-fixtures/extmodule/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/src/test-fixtures/extmodule/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
index 941f9b3..587f7ff 100644
--- a/src/test-fixtures/extmodule/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
+++ b/src/test-fixtures/extmodule/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
@@ -1,3 +1,17 @@
+# 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.
// This file is used to test the extension module framework
moduleName=Test module for Grab
moduleVersion=1.3
[2/2] incubator-groovy git commit: use gradle rat plugin instead of
java exec integration
Posted by pa...@apache.org.
use gradle rat plugin instead of java exec integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/a8f5e00f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/a8f5e00f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/a8f5e00f
Branch: refs/heads/GROOVY_2_4_X
Commit: a8f5e00fa98e87fddccd6abea47af9b04186ad78
Parents: 291c2b5
Author: paulk <pa...@asert.com.au>
Authored: Thu Jun 25 23:08:25 2015 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Thu Jun 25 23:29:11 2015 +1000
----------------------------------------------------------------------
gradle/quality.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/a8f5e00f/gradle/quality.gradle
----------------------------------------------------------------------
diff --git a/gradle/quality.gradle b/gradle/quality.gradle
index 94b861a..4be96a7 100644
--- a/gradle/quality.gradle
+++ b/gradle/quality.gradle
@@ -132,7 +132,7 @@ allprojects {
}
}
- rat
+ rat {
// Input directory, defaults to the project's root directory
inputDir = project.file( 'src' )