You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/01/07 10:18:33 UTC
[groovy] branch GROOVY_3_0_X updated (3ff9a86 -> 386aa8e)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 3ff9a86 GROOVY-9120: check for local variable references within AIC
new 2ce23d1 Workaround JMH classpath issue
new 1064df5 Apply WARN duplicate classes strategy
new cdf73cc GROOVY-9358: Bump jmh gradle plugin to 0.5.0
new 20d76c3 Support joint compilation
new 1ebabff Make performanceTestGroovy depend on compileTestGroovy
new a184608 Avoid groovy classes confliction when running jmhJar
new 386aa8e GROOVY-9359: Bump javaparser to 3.15.9
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 2 +-
subprojects/performance/build.gradle | 14 +++++++++-----
.../groovy/org/apache/groovy/bench/Ackermann.groovy | 0
.../org/apache/groovy/bench/AckermannBench.java | 0
.../groovy/org/apache/groovy/bench/Ary.groovy | 0
.../{java => groovy}/org/apache/groovy/bench/AryBench.java | 0
.../groovy/org/apache/groovy/bench/Fibo.groovy | 0
.../org/apache/groovy/bench/FiboBench.java | 0
.../org/apache/groovy/bench/GeneratedHashCode.groovy | 0
.../org/apache/groovy/bench/GeneratedHashCodeBench.java | 0
.../org/apache/groovy/bench/dispatch/Callsite.groovy | 0
.../org/apache/groovy/bench/dispatch/CallsiteBench.java | 0
.../apache/groovy/plugin/GroovyRunnerRegistryBench.java | 0
13 files changed, 10 insertions(+), 6 deletions(-)
rename subprojects/performance/src/{test => jmh}/groovy/org/apache/groovy/bench/Ackermann.groovy (100%)
rename subprojects/performance/src/jmh/{java => groovy}/org/apache/groovy/bench/AckermannBench.java (100%)
rename subprojects/performance/src/{test => jmh}/groovy/org/apache/groovy/bench/Ary.groovy (100%)
rename subprojects/performance/src/jmh/{java => groovy}/org/apache/groovy/bench/AryBench.java (100%)
rename subprojects/performance/src/{test => jmh}/groovy/org/apache/groovy/bench/Fibo.groovy (100%)
rename subprojects/performance/src/jmh/{java => groovy}/org/apache/groovy/bench/FiboBench.java (100%)
rename subprojects/performance/src/{test => jmh}/groovy/org/apache/groovy/bench/GeneratedHashCode.groovy (100%)
rename subprojects/performance/src/jmh/{java => groovy}/org/apache/groovy/bench/GeneratedHashCodeBench.java (100%)
rename subprojects/performance/src/{test => jmh}/groovy/org/apache/groovy/bench/dispatch/Callsite.groovy (100%)
rename subprojects/performance/src/jmh/{java => groovy}/org/apache/groovy/bench/dispatch/CallsiteBench.java (100%)
rename subprojects/performance/src/jmh/{java => groovy}/org/apache/groovy/plugin/GroovyRunnerRegistryBench.java (100%)
[groovy] 02/07: Apply WARN duplicate classes strategy
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 1064df5a7491e6472fac58b66b521f86e0aee646
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Jan 4 22:20:14 2020 +0800
Apply WARN duplicate classes strategy
(cherry picked from commit ad54587814898a2823d7bc0ffc5ee8ccaae3a1da)
---
subprojects/performance/build.gradle | 1 +
1 file changed, 1 insertion(+)
diff --git a/subprojects/performance/build.gradle b/subprojects/performance/build.gradle
index 60424b8..1230ec6 100644
--- a/subprojects/performance/build.gradle
+++ b/subprojects/performance/build.gradle
@@ -40,6 +40,7 @@ jmh {
include = ['.*' + project.benchInclude + '.*']
}
includeTests = true
+ duplicateClassesStrategy = 'WARN'
}
jmhClasses.dependsOn clean
[groovy] 05/07: Make performanceTestGroovy depend on
compileTestGroovy
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 1ebabff3b39367b7e0fc2c0b8c03d05bc9a8b0c9
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Jan 4 23:32:14 2020 +0800
Make performanceTestGroovy depend on compileTestGroovy
(cherry picked from commit 78ba7359357fe1919c8d31f34cb889e9713069a5)
---
subprojects/performance/build.gradle | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/subprojects/performance/build.gradle b/subprojects/performance/build.gradle
index 2a2e962..013b477 100644
--- a/subprojects/performance/build.gradle
+++ b/subprojects/performance/build.gradle
@@ -76,8 +76,7 @@ task performanceTests {
}
['1.8.9', '2.0.8', '2.1.9', '2.2.2', '2.3.10', '2.3.11', '2.4.7', 'current'].each { version ->
- def t = task "performanceTestGroovy${version.replace('.', '_')}"(type: JavaExec) {
- dependsOn compileTestJava
+ def t = task "performanceTestGroovy${version.replace('.', '_')}"(type: JavaExec, dependsOn: compileTestGroovy) {
def groovyConf = configurations.detachedConfiguration(
dependencies.create(
'current' == version ? files(rootProject.jar.archivePath) : "org.codehaus.groovy:groovy:$version")
[groovy] 04/07: Support joint compilation
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 20d76c3f6a2d538d3f0e39a8f98018154d018342
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Jan 4 22:23:58 2020 +0800
Support joint compilation
(cherry picked from commit ed5d60a0533d0d76acf375ea811e1a6dc8838f17)
---
.../src/{test => jmh}/groovy/org/apache/groovy/bench/Ackermann.groovy | 0
.../src/jmh/{java => groovy}/org/apache/groovy/bench/AckermannBench.java | 0
.../src/{test => jmh}/groovy/org/apache/groovy/bench/Ary.groovy | 0
.../src/jmh/{java => groovy}/org/apache/groovy/bench/AryBench.java | 0
.../src/{test => jmh}/groovy/org/apache/groovy/bench/Fibo.groovy | 0
.../src/jmh/{java => groovy}/org/apache/groovy/bench/FiboBench.java | 0
.../{test => jmh}/groovy/org/apache/groovy/bench/GeneratedHashCode.groovy | 0
.../{java => groovy}/org/apache/groovy/bench/GeneratedHashCodeBench.java | 0
.../{test => jmh}/groovy/org/apache/groovy/bench/dispatch/Callsite.groovy | 0
.../{java => groovy}/org/apache/groovy/bench/dispatch/CallsiteBench.java | 0
.../org/apache/groovy/plugin/GroovyRunnerRegistryBench.java | 0
11 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/performance/src/test/groovy/org/apache/groovy/bench/Ackermann.groovy b/subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/Ackermann.groovy
similarity index 100%
rename from subprojects/performance/src/test/groovy/org/apache/groovy/bench/Ackermann.groovy
rename to subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/Ackermann.groovy
diff --git a/subprojects/performance/src/jmh/java/org/apache/groovy/bench/AckermannBench.java b/subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/AckermannBench.java
similarity index 100%
rename from subprojects/performance/src/jmh/java/org/apache/groovy/bench/AckermannBench.java
rename to subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/AckermannBench.java
diff --git a/subprojects/performance/src/test/groovy/org/apache/groovy/bench/Ary.groovy b/subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/Ary.groovy
similarity index 100%
rename from subprojects/performance/src/test/groovy/org/apache/groovy/bench/Ary.groovy
rename to subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/Ary.groovy
diff --git a/subprojects/performance/src/jmh/java/org/apache/groovy/bench/AryBench.java b/subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/AryBench.java
similarity index 100%
rename from subprojects/performance/src/jmh/java/org/apache/groovy/bench/AryBench.java
rename to subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/AryBench.java
diff --git a/subprojects/performance/src/test/groovy/org/apache/groovy/bench/Fibo.groovy b/subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/Fibo.groovy
similarity index 100%
rename from subprojects/performance/src/test/groovy/org/apache/groovy/bench/Fibo.groovy
rename to subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/Fibo.groovy
diff --git a/subprojects/performance/src/jmh/java/org/apache/groovy/bench/FiboBench.java b/subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/FiboBench.java
similarity index 100%
rename from subprojects/performance/src/jmh/java/org/apache/groovy/bench/FiboBench.java
rename to subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/FiboBench.java
diff --git a/subprojects/performance/src/test/groovy/org/apache/groovy/bench/GeneratedHashCode.groovy b/subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/GeneratedHashCode.groovy
similarity index 100%
rename from subprojects/performance/src/test/groovy/org/apache/groovy/bench/GeneratedHashCode.groovy
rename to subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/GeneratedHashCode.groovy
diff --git a/subprojects/performance/src/jmh/java/org/apache/groovy/bench/GeneratedHashCodeBench.java b/subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/GeneratedHashCodeBench.java
similarity index 100%
rename from subprojects/performance/src/jmh/java/org/apache/groovy/bench/GeneratedHashCodeBench.java
rename to subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/GeneratedHashCodeBench.java
diff --git a/subprojects/performance/src/test/groovy/org/apache/groovy/bench/dispatch/Callsite.groovy b/subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/dispatch/Callsite.groovy
similarity index 100%
rename from subprojects/performance/src/test/groovy/org/apache/groovy/bench/dispatch/Callsite.groovy
rename to subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/dispatch/Callsite.groovy
diff --git a/subprojects/performance/src/jmh/java/org/apache/groovy/bench/dispatch/CallsiteBench.java b/subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/dispatch/CallsiteBench.java
similarity index 100%
rename from subprojects/performance/src/jmh/java/org/apache/groovy/bench/dispatch/CallsiteBench.java
rename to subprojects/performance/src/jmh/groovy/org/apache/groovy/bench/dispatch/CallsiteBench.java
diff --git a/subprojects/performance/src/jmh/java/org/apache/groovy/plugin/GroovyRunnerRegistryBench.java b/subprojects/performance/src/jmh/groovy/org/apache/groovy/plugin/GroovyRunnerRegistryBench.java
similarity index 100%
rename from subprojects/performance/src/jmh/java/org/apache/groovy/plugin/GroovyRunnerRegistryBench.java
rename to subprojects/performance/src/jmh/groovy/org/apache/groovy/plugin/GroovyRunnerRegistryBench.java
[groovy] 06/07: Avoid groovy classes confliction when running jmhJar
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit a1846084c27e0468cd01b89088cfb8fc90cfc70f
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Jan 5 01:23:23 2020 +0800
Avoid groovy classes confliction when running jmhJar
(cherry picked from commit d53928bba274798cb47f25a066abd5f5e1db5c84)
---
subprojects/performance/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/performance/build.gradle b/subprojects/performance/build.gradle
index 013b477..f377367 100644
--- a/subprojects/performance/build.gradle
+++ b/subprojects/performance/build.gradle
@@ -30,7 +30,7 @@ configurations {
dependencies {
jmh rootProject
- testImplementation 'org.codehaus.groovy:groovy-all:2.4.17'
+ testImplementation rootProject
stats 'org.apache.commons:commons-math3:3.6'
}
[groovy] 01/07: Workaround JMH classpath issue
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 2ce23d14c7e811b947628d96b40f45c34ee55a3d
Author: Bo Zhang <zh...@gmail.com>
AuthorDate: Sat Jan 4 21:47:18 2020 +0800
Workaround JMH classpath issue
(cherry picked from commit 8104703f1d45fd35553cb41532376a823b771a30)
---
subprojects/performance/build.gradle | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/subprojects/performance/build.gradle b/subprojects/performance/build.gradle
index d788225..60424b8 100644
--- a/subprojects/performance/build.gradle
+++ b/subprojects/performance/build.gradle
@@ -124,3 +124,7 @@ task performanceTests {
}
performanceTests.dependsOn(t)
}
+
+compileJmhGroovy {
+ classpath += compileJmhJava.classpath
+}
[groovy] 07/07: GROOVY-9359: Bump javaparser to 3.15.9
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 386aa8e07c4849bdab258611047fda50de05714b
Author: Daniel Sun <su...@apache.org>
AuthorDate: Tue Jan 7 18:10:33 2020 +0800
GROOVY-9359: Bump javaparser to 3.15.9
(cherry picked from commit 357ff40e74830aee064afced40572b2990601865)
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 0255bf9..955beba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -141,7 +141,7 @@ ext {
ivyVersion = '2.5.0'
jansiVersion = '1.18'
jarjarVersion = '1.7.2'
- javaParserVersion = '3.15.8'
+ javaParserVersion = '3.15.9'
jlineVersion = '2.14.6'
jmockVersion = '1.2.0'
logbackVersion = '1.1.7'
[groovy] 03/07: GROOVY-9358: Bump jmh gradle plugin to 0.5.0
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit cdf73cc317eb8069e01c9b7e19dbe1f5db049fd3
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Jan 4 22:22:05 2020 +0800
GROOVY-9358: Bump jmh gradle plugin to 0.5.0
(cherry picked from commit 3f559a018f7362c8e78d53623743c583fcc61ae6)
---
subprojects/performance/build.gradle | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/subprojects/performance/build.gradle b/subprojects/performance/build.gradle
index 1230ec6..2a2e962 100644
--- a/subprojects/performance/build.gradle
+++ b/subprojects/performance/build.gradle
@@ -20,7 +20,7 @@
import java.text.DecimalFormat
plugins {
- id "me.champeau.gradle.jmh" version "0.4.8"
+ id "me.champeau.gradle.jmh" version "0.5.0"
}
configurations {
@@ -30,12 +30,12 @@ configurations {
dependencies {
jmh rootProject
- testImplementation 'org.codehaus.groovy:groovy-all:2.4.12'
+ testImplementation 'org.codehaus.groovy:groovy-all:2.4.17'
stats 'org.apache.commons:commons-math3:3.6'
}
jmh {
- jmhVersion = '1.19'
+ jmhVersion = '1.21'
if (project.hasProperty('benchInclude')) {
include = ['.*' + project.benchInclude + '.*']
}