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 f23de5d274f0d1ce161d013609dcf03734babcd7 Author: Paul King <[email protected]> AuthorDate: Tue Dec 1 23:37:53 2020 +1000 release improvements for new Groovy 4 build --- README.adoc | 5 +---- build.gradle | 1 - gradle/verification-metadata.xml | 12 ++++++++++++ wrapper.gradle => wrapperBootstrap/build.gradle | 16 +++++++++++++++- wrapperBootstrap/settings.gradle | 0 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/README.adoc b/README.adoc index 86325e1..d0a56d2 100644 --- a/README.adoc +++ b/README.adoc @@ -118,12 +118,9 @@ expecting. To bootstrap Gradle, at the top directory of your unpacked source, run the command: - gradle -b wrapper.gradle wrapper + gradle -p wrapperBootstrap bootstrap On Unix-like systems, use `./gradle`. -If the version of Gradle you have installed is close to the required version, -you might be able to get away without the `-b wrapper.gradle` above, but if in -doubt leave it in. [NOTE] At this point, the Gradle wrapper should be set up and from now on you should use diff --git a/build.gradle b/build.gradle index b0090f6..c566c9e 100644 --- a/build.gradle +++ b/build.gradle @@ -244,7 +244,6 @@ apply from: 'gradle/licenses.gradle' // works pretty nice, but it's up to the Groovy devs to decide apply from: 'gradle/idea.gradle' apply from: 'gradle/eclipse.gradle' -apply from: 'wrapper.gradle' // If a local configuration file for tweaking the build is present, apply it if (file('user.gradle').exists()) { diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 7867f75..a8c7c1c 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -46,6 +46,7 @@ </trusted-artifacts> <ignored-keys> <ignored-key id="74dafdfd6dae2441" reason="Key couldn't be downloaded from any key server"/> + <ignored-key id="9ae296fd02e9f65b" reason="Key couldn't be downloaded from any key server"/> </ignored-keys> <trusted-keys> <trusted-key id="019082bc00e0324e2aef4cf00d3b328562a119a7" group="org.openjdk.jmh"/> @@ -382,6 +383,11 @@ <pgp value="31fae244a81d64507b47182e1b2718089ce964b8"/> </artifact> </component> + <component group="com.thoughtworks.xstream" name="xstream" version="1.4.10"> + <artifact name="xstream-1.4.10.jar"> + <pgp value="050a37a2e0577f4baa095b52602ec18d20c4661c"/> + </artifact> + </component> <component group="com.thoughtworks.xstream" name="xstream" version="1.4.11.1"> <artifact name="xstream-1.4.11.1.jar"> <pgp value="050a37a2e0577f4baa095b52602ec18d20c4661c"/> @@ -620,6 +626,7 @@ <component group="org.apache.commons" name="commons-math3" version="3.2"> <artifact name="commons-math3-3.2.jar"> <pgp value="12d16069219c90212a974d119ae296fd02e9f65b"/> + <sha512 value="80fb66a51688c4247b957f9787921e5acb9144d71a4ab0b03b2c30f46427e50c53e6e31ca5ddb04dab2cf5e7c0eedae168103c719f8074be464918ab2e4d6e6d" origin="Generated by Gradle because a key couldn't be downloaded"/> </artifact> </component> <component group="org.apache.commons" name="commons-math3" version="3.6.1"> @@ -912,6 +919,11 @@ <pgp value="b94797af54ae59b1e3c154da8e1ad594207b7fb2"/> </artifact> </component> + <component group="org.slf4j" name="slf4j-api" version="1.7.25"> + <artifact name="slf4j-api-1.7.25.jar"> + <pgp value="475f3b8e59e6e63aa78067482c7b12f2a511e325"/> + </artifact> + </component> <component group="org.sonatype.plexus" name="plexus-build-api" version="0.0.4"> <artifact name="plexus-build-api-0.0.4.jar"> <sha512 value="62efa617e564958a2b427acc4fcd6b8ad407620857774827222840bbd0d349e96deceb20925a29cce3933306bdbed01abebf9b80f050d43830ce44cb86a40c23" origin="Generated by Gradle because artifact wasn't signed"/> diff --git a/wrapper.gradle b/wrapperBootstrap/build.gradle similarity index 66% rename from wrapper.gradle rename to wrapperBootstrap/build.gradle index ccaf76e..6191fbd 100644 --- a/wrapper.gradle +++ b/wrapperBootstrap/build.gradle @@ -16,6 +16,20 @@ * specific language governing permissions and limitations * under the License. */ + +def props = new Properties() +file("$projectDir/../gradle.properties").withInputStream { + props.load(it) +} + tasks.withType(Wrapper).configureEach { - gradleVersion = gradle_version + gradleVersion = props.gradle_version +} + +task bootstrap(dependsOn: 'wrapper') { + doLast { + ant.move file: "${projectDir}/gradlew", todir: "${projectDir}/../" + ant.move file: "${projectDir}/gradlew.bat", todir: "${projectDir}/../" + ant.move file: "${projectDir}/gradle/wrapper", todir: "${projectDir}/../gradle/" + } } diff --git a/wrapperBootstrap/settings.gradle b/wrapperBootstrap/settings.gradle new file mode 100644 index 0000000..e69de29
