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/10/16 14:14:55 UTC

[1/2] incubator-groovy git commit: Update GrapeIvy.groovy: set ivyInstance to IvyContext, for speed up

Repository: incubator-groovy
Updated Branches:
  refs/heads/master 0e7f67b87 -> 7802fb0e0


Update GrapeIvy.groovy: set ivyInstance to IvyContext, for speed up

When custom grape.config is present(-Dgrape.config=...), there are no need load default ivysettings!

if you want see the diff,run with -Dgrape.config=... and -Divy.message.logger.level=4


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

Branch: refs/heads/master
Commit: de9c3404e5506e962ea3641872937877bed7c328
Parents: 0e7f67b
Author: qxo <qx...@gmail.com>
Authored: Sun Jul 19 01:52:39 2015 +0800
Committer: paulk <pa...@asert.com.au>
Committed: Fri Oct 16 22:14:15 2015 +1000

----------------------------------------------------------------------
 src/main/groovy/grape/GrapeIvy.groovy | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/de9c3404/src/main/groovy/grape/GrapeIvy.groovy
----------------------------------------------------------------------
diff --git a/src/main/groovy/grape/GrapeIvy.groovy b/src/main/groovy/grape/GrapeIvy.groovy
index ef12154..0aaab39 100644
--- a/src/main/groovy/grape/GrapeIvy.groovy
+++ b/src/main/groovy/grape/GrapeIvy.groovy
@@ -109,6 +109,7 @@ class GrapeIvy implements GrapeEngine {
 
         settings.setVariable("ivy.default.configuration.m2compatible", "true")
         ivyInstance = Ivy.newInstance(settings)
+        org.apache.ivy.core.IvyContext.getContext().setIvy(ivyInstance);
         resolvedDependencies = []
         downloadedArtifacts = []
 


[2/2] incubator-groovy git commit: add gradle license report plugin

Posted by pa...@apache.org.
add gradle license report plugin


Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/7802fb0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/7802fb0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/7802fb0e

Branch: refs/heads/master
Commit: 7802fb0e058bfda4865e6467f2723eab2d165815
Parents: de9c340
Author: paulk <pa...@asert.com.au>
Authored: Fri Oct 16 22:13:55 2015 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri Oct 16 22:14:16 2015 +1000

----------------------------------------------------------------------
 build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7802fb0e/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index d4f34e7..a8742ca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,6 +40,7 @@ buildscript {
         //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.3"
+        classpath "gradle.plugin.com.github.jk1:gradle-license-report:0.3.2"
     }
 }
 
@@ -47,6 +48,7 @@ apply from: 'gradle/filter.gradle'
 apply from: 'gradle/indy.gradle'
 apply from: 'gradle/bintray.gradle'
 apply plugin: 'javadocHotfix'
+apply plugin: "com.github.jk1.dependency-license-report"
 
 File javaHome = new File(System.getProperty('java.home'))
 logger.lifecycle "Using Java from $javaHome (version ${System.getProperty('java.version')})"
@@ -466,6 +468,11 @@ if (!JavaVersion.current().java7Compatible) {
 '''
 }
 
+licenseReport {
+    excludeGroups = ['com.googlecode'] // openbeans dependency (jar) has no pom but is ASL2
+//    configurations = ['compile']
+}
+
 // UNCOMMENT THE FOLLOWING TASKS IF YOU WANT TO RUN LICENSE CHECKING
 //task licenseFormatCustom(type:nl.javadude.gradle.plugins.license.License) {
 //    source = fileTree(dir:"src").include ("**/*.java",'**/*.groovy','**/*.html','**/*.css','**/*.xml','**/*.properties','**/*.properties')