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 2021/09/18 08:34:58 UTC
[groovy] branch master updated: GROOVY-10237: Bump gradle to 7.2
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 790fabd GROOVY-10237: Bump gradle to 7.2
790fabd is described below
commit 790fabd5ef25296d980c766b304b2138de657bc1
Author: Bo Zhang <zh...@gmail.com>
AuthorDate: Sat Sep 18 16:34:38 2021 +0800
GROOVY-10237: Bump gradle to 7.2
---
build.gradle | 6 +++++-
buildSrc/src/main/groovy/org.apache.groovy-all.gradle | 4 ++--
gradle.properties | 2 +-
gradle/verification-metadata.xml | 13 ++++---------
gradle/wrapper/gradle-wrapper.properties | 2 +-
5 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/build.gradle b/build.gradle
index 82c4927..7507b67 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ buildscript {
plugins {
id 'me.champeau.buildscan-recipes' version '0.2.3'
id 'com.github.ben-manes.versions' version '0.39.0'
- id 'com.github.blindpirate.osgi' version '0.0.4'
+ id 'com.github.blindpirate.osgi' version '0.0.6'
id 'org.sonarqube' version '3.0'
id 'org.apache.groovy-core'
id 'java-test-fixtures'
@@ -181,6 +181,10 @@ configurations {
}
}
+tasks.withType(AbstractCopyTask).configureEach {
+ it.duplicatesStrategy = DuplicatesStrategy.WARN
+}
+
tasks.named('jar') {
metaInf {
from("$projectDir/licenses/LICENSE-JARJAR")
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-all.gradle b/buildSrc/src/main/groovy/org.apache.groovy-all.gradle
index cde704e..3e71737 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-all.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-all.gradle
@@ -40,10 +40,10 @@ javaPlatform {
configurations {
allSources {
- extendsFrom runtime
+ extendsFrom runtimeElements
}
allSourcesRuntimeClasspath {
- extendsFrom runtime
+ extendsFrom runtimeElements
}
}
diff --git a/gradle.properties b/gradle.properties
index cd07b6d..e22c405 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ groovyVersion = 4.0.0-SNAPSHOT
groovyBundleVersion = 4.0.0.SNAPSHOT
binaryCompatibilityBaseline = 3.0.5
-gradle_version=6.9.1
+gradle_version=7.2
groovyJUnit_ms=512m
groovyJUnit_mx=2g
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 211a700..09a4765 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -37,7 +37,7 @@
Do not remove this header.
-->
-<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.0.xsd">
+<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.1.xsd">
<configuration>
<verify-metadata>false</verify-metadata>
<verify-signatures>true</verify-signatures>
@@ -472,14 +472,9 @@
<pgp value="0cc641c3a62453ab390066c4a41f13c999945293"/>
</artifact>
</component>
- <component group="gradle.plugin.com.github.blindpirate" name="gradle-legacy-osgi-plugin" version="0.0.3">
- <artifact name="gradle-legacy-osgi-plugin-0.0.3.jar">
- <sha512 value="39fd94b4109c01a9f471c89eaf0ae12d3ae8b214e99c055ca7933c95660574b6ed0c4282c882606bffad25883df429cd5dd43b3442b2c8316e43c1d20516fc44" origin="Generated by Gradle because artifact wasn't signed"/>
- </artifact>
- </component>
- <component group="gradle.plugin.com.github.blindpirate" name="gradle-legacy-osgi-plugin" version="0.0.4">
- <artifact name="gradle-legacy-osgi-plugin-0.0.4.jar">
- <sha512 value="21f1ed1277792521c8fb0895202f561d8b720ae32959c8fdba9bbd4610372253e5cb5f63c80eff160a91a5e4cd58e751bc325e96808b0745aad025b7c0100c69" origin="Generated by Gradle because artifact wasn't signed"/>
+ <component group="gradle.plugin.com.github.blindpirate" name="gradle-legacy-osgi-plugin" version="0.0.6">
+ <artifact name="gradle-legacy-osgi-plugin-0.0.6.jar">
+ <sha512 value="e300046e594f28b3611eeeb34c5ae50f7926fe71761ae203d9af18469a90386cc724a67e9123034fe192220a90f18ea63806ef27a432adecc369351a069b3a76" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="gradle.plugin.com.github.jk1" name="gradle-license-report" version="1.3">
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3ab0b72..ffed3a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists