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 2022/04/01 05:51:07 UTC
[groovy] branch master updated (efe60eb -> 8f5a00d)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from efe60eb GROOVY-10560: Provide additional XmlUtil variants for more options when disabling doctypes
new 3cb5f50 GROOVY-10562: Bump japicmp plugin to 0.4.0 (build dependency)
new 8f5a00d remove gradle warnings
The 2 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:
.../src/main/groovy/org.apache.groovy-core.gradle | 2 +-
.../org/apache/groovy/gradle/CoreExtension.groovy | 2 +-
gradle/verification-metadata.xml | 42 ++++++++++++++++++++--
subprojects/binary-compatibility/build.gradle | 10 +++---
subprojects/groovy-console/build.gradle | 2 +-
subprojects/groovy-groovydoc/build.gradle | 2 +-
6 files changed, 48 insertions(+), 12 deletions(-)
[groovy] 02/02: remove gradle warnings
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 8f5a00dbbc2995765f389f21bfd17424b87285a1
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Apr 1 15:51:00 2022 +1000
remove gradle warnings
---
buildSrc/src/main/groovy/org.apache.groovy-core.gradle | 2 +-
buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy | 2 +-
subprojects/groovy-console/build.gradle | 2 +-
subprojects/groovy-groovydoc/build.gradle | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-core.gradle b/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
index 7a1fd01..4b3ff41 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
@@ -167,7 +167,7 @@ tasks.named('compileJava') {
doLast {
execOperations.javaexec { spec ->
spec.classpath(rootProject.configurations.tools)
- spec.main('org.jboss.bridger.Bridger')
+ spec.mainClass = 'org.jboss.bridger.Bridger'
spec.args(groovyCore.classesToBridge.asList().collect { it.absolutePath })
}
}
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy b/buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy
index 3503dd2..c8c6a2e 100644
--- a/buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy
+++ b/buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy
@@ -39,7 +39,7 @@ class CoreExtension {
void bridgedClasses(String... classes) {
classes.each {
- def baseDir = sourceSets.getByName("main").java.outputDir
+ def baseDir = sourceSets.getByName("main").java.classesDirectory.get().asFile
classesToBridge.from(new File(baseDir, "/" + it.replace((char) '.', (char) '/') + ".class"))
}
}
diff --git a/subprojects/groovy-console/build.gradle b/subprojects/groovy-console/build.gradle
index 5e62961..54e2804 100644
--- a/subprojects/groovy-console/build.gradle
+++ b/subprojects/groovy-console/build.gradle
@@ -43,6 +43,6 @@ dependencies {
tasks.register("console", JavaExec) {
jvmArgs += ["-Dgroovy.attach.groovydoc=true"]
- main = 'groovy.console.ui.Console'
+ mainClass = 'groovy.console.ui.Console'
classpath = sourceSets.main.runtimeClasspath
}
diff --git a/subprojects/groovy-groovydoc/build.gradle b/subprojects/groovy-groovydoc/build.gradle
index cbb1a28..8d3b7d0 100644
--- a/subprojects/groovy-groovydoc/build.gradle
+++ b/subprojects/groovy-groovydoc/build.gradle
@@ -34,7 +34,7 @@ dependencies {
compileJava {
doLast {
- mkdir "$sourceSets.main.java.outputDir/META-INF"
+ mkdir "${sourceSets.main.java.classesDirectory.get().asFile}/META-INF"
}
}
[groovy] 01/02: GROOVY-10562: Bump japicmp plugin to 0.4.0 (build dependency)
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 3cb5f509ab79c93f18839af608944b21703bdef1
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Apr 1 15:50:27 2022 +1000
GROOVY-10562: Bump japicmp plugin to 0.4.0 (build dependency)
---
gradle/verification-metadata.xml | 42 +++++++++++++++++++++++++--
subprojects/binary-compatibility/build.gradle | 10 +++----
2 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 055171b..85f8138 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -55,6 +55,7 @@
<ignored-key id="b4c70893b62babe8" reason="Key couldn't be downloaded from any key server"/>
<ignored-key id="c038787776a19d18" reason="Key couldn't be downloaded from any key server"/>
<ignored-key id="6a65176a0fb1cd0b" reason="Key couldn't be downloaded from any key server"/>
+ <ignored-key id="7ecbd740ff06aeb5" reason="Key couldn't be downloaded from any key server"/>
</ignored-keys>
<trusted-keys>
<trusted-key id="019082bc00e0324e2aef4cf00d3b328562a119a7" group="org.openjdk.jmh"/>
@@ -388,6 +389,16 @@
<pgp value="06d34ed6ff73de368a772a781063fe98bcecb758"/>
</artifact>
</component>
+ <component group="com.sun.istack" name="istack-commons-runtime" version="3.0.8">
+ <artifact name="istack-commons-runtime-3.0.8.jar">
+ <sha512 value="e712166f961cca819a61bd6efc93b93759788d283af73dcc6ed09c0f9c045d7dc2f7fabc0e236b2996fcdebe26e1b2ec5ea45eb4353943dad82ecfef0488305e" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="com.sun.xml.fastinfoset" name="FastInfoset" version="1.2.16">
+ <artifact name="FastInfoset-1.2.16.jar">
+ <sha512 value="cd57377d61d66ac2ab6ab90483252385fe2bbb9e13dee07913362a64ffe97b16082df981dbe469df3f67ad946827be6f4355d63003a393bda62a0fc8b54a590b" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="com.thoughtworks.qdox" name="qdox" version="1.12.1">
<artifact name="qdox-1.12.1.jar">
<pgp value="31fae244a81d64507b47182e1b2718089ce964b8"/>
@@ -458,6 +469,16 @@
<pgp value="050a37a2e0577f4baa095b52602ec18d20c4661c"/>
</artifact>
</component>
+ <component group="jakarta.activation" name="jakarta.activation-api" version="1.2.1">
+ <artifact name="jakarta.activation-api-1.2.1.jar">
+ <pgp value="6dd3b8c64ef75253beb2c53ad908a43fb7ec07ac"/>
+ </artifact>
+ </component>
+ <component group="jakarta.xml.bind" name="jakarta.xml.bind-api" version="2.3.2">
+ <artifact name="jakarta.xml.bind-api-2.3.2.jar">
+ <pgp value="fc411cd3cb7dcb0abc9801058118b3bcdb1a5000"/>
+ </artifact>
+ </component>
<component group="javax.activation" name="activation" version="1.1">
<artifact name="activation-1.1.jar">
<sha512 value="c0ff5bf3ace7acc1b31fcc109cee48d9eb8f025ae15a31dc91eca760933bdb97c93f05d61e95af1e317859d72e5f179f897f5bf3df0e3810f4212d43bacee4bd" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -544,9 +565,9 @@
<sha512 value="2059df05624934092062ea615f188f5adfa80929fb7f5f1c341c60a7f86eeb31539021bf98fb7a5354c071c7ef2be99e5fdd459fc38bb621b8b447984da128cb" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
- <component group="me.champeau.gradle" name="japicmp-gradle-plugin" version="0.3.1">
- <artifact name="japicmp-gradle-plugin-0.3.1.jar">
- <sha512 value="d9009935726cbfd714a60fa6cfc89ba8647433980f7605336458ea04f75940d6c3e3bdac5528f508783ac01320a171f82225c99ebeaea683244c8cee4e933af5" origin="Generated by Gradle because artifact wasn't signed"/>
+ <component group="me.champeau.gradle" name="japicmp-gradle-plugin" version="0.4.0">
+ <artifact name="japicmp-gradle-plugin-0.4.0.jar">
+ <sha512 value="e3b75c9fd3b3cde18c024e387211217330dd6e08f1ee3f25a57e47cc295e220f48530d9f971ce72eb7ece93cd091e3ccba7f0217637f5bc331d9aac98ac9483d" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="me.champeau.gradle" name="jmh-gradle-plugin" version="0.5.3">
@@ -924,6 +945,16 @@
<pgp value="dc98224c6421a7a5bb87f346ed2378cd09a08cde"/>
</artifact>
</component>
+ <component group="org.glassfish.jaxb" name="jaxb-runtime" version="2.3.2">
+ <artifact name="jaxb-runtime-2.3.2.jar">
+ <sha512 value="8a6cf3dd9fac4fb6ddb5f0861a2cac093e04d186fc787ee78c30862d225eb677b9605e1177cf57da0d4f45c613f107187c330be0684b43b0cab9a922cd96db66" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
+ <component group="org.glassfish.jaxb" name="txw2" version="2.3.2">
+ <artifact name="txw2-2.3.2.jar">
+ <sha512 value="66c174093c47b75b900159c5449bd99eb15308d15b395771367adc5862612edb985c3678428c4f60e7c27b46d123afac39277f80db766511a6b6f0756d525559" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="org.gmetrics" name="GMetrics" version="1.1">
<artifact name="GMetrics-1.1.jar">
<pgp value="851264c36365d4ff9427625f38362fd5cfa2668b"/>
@@ -991,6 +1022,11 @@
<pgp value="ff6e2c001948c5f2f38b0cc385911f425ec61b51"/>
</artifact>
</component>
+ <component group="org.jvnet.staxex" name="stax-ex" version="1.8.1">
+ <artifact name="stax-ex-1.8.1.jar">
+ <sha512 value="d060ea5dcc81508a1078bd0ed947553a5652a5a78da76cd00dc2e384dca014166dfe92777fceb7d7868699894d7e40ecef99fac7771372025bfd7f1fa3e2fe32" origin="Generated by Gradle because a key couldn't be downloaded"/>
+ </artifact>
+ </component>
<component group="org.multiverse" name="multiverse-core" version="0.7.0">
<artifact name="multiverse-core-0.7.0.jar">
<sha512 value="517dc0667957d52876992a04b6d585453ef9124c89aaa72e9e2a6c022a97854e7f647a2f1bf3aab5c5cf53c3908a69a93b141bf67e64be75204f5be9eec686f6" origin="Generated by Gradle because artifact wasn't signed"/>
diff --git a/subprojects/binary-compatibility/build.gradle b/subprojects/binary-compatibility/build.gradle
index 3492eed..b9ff3b7 100644
--- a/subprojects/binary-compatibility/build.gradle
+++ b/subprojects/binary-compatibility/build.gradle
@@ -19,7 +19,7 @@ import me.champeau.gradle.japicmp.JapicmpTask
* under the License.
*/
plugins {
- id "me.champeau.gradle.japicmp" version "0.3.1"
+ id "me.champeau.gradle.japicmp" version "0.4.0"
id 'org.apache.groovy-aggregating-project'
id 'org.apache.groovy-common'
}
@@ -43,10 +43,10 @@ rootProject.allprojects {
dependencies.add(thisProject.dependencies.create(baselineCoords))
}
def singleProjectCheck = thisProject.tasks.register(taskName, JapicmpTask) {
- oldArchives = baseline
- newArchives = files(tasks.named("jarjar"))
- oldClasspath = files()
- newClasspath = files()
+ oldArchives.from(baseline)
+ newArchives.from(files(tasks.named("jarjar")))
+ oldClasspath.from(files())
+ newClasspath.from(files())
accessModifier = "protected"
onlyModified = true
failOnModification = false