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 2020/12/05 06:14:20 UTC
[groovy] branch master updated (da0b9c9 -> b12ea87)
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 da0b9c9 ensure no dup entries in doc zip
new ab34a46 simplify bootstrap
new b12ea87 add license headers
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:
.github/SECURITY.md | 16 ++++++++++++++++
CODE_OF_CONDUCT.md | 16 ++++++++++++++++
CONTRIBUTING.md | 16 ++++++++++++++++
README.adoc | 2 +-
{wrapperBootstrap => bootstrap}/build.gradle | 8 +++++---
{wrapperBootstrap => bootstrap}/settings.gradle | 0
buildSrc/src/main/groovy/org.apache.groovy-common.gradle | 3 ++-
7 files changed, 56 insertions(+), 5 deletions(-)
rename {wrapperBootstrap => bootstrap}/build.gradle (80%)
rename {wrapperBootstrap => bootstrap}/settings.gradle (100%)
[groovy] 01/02: simplify bootstrap
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 ab34a46dfb21216609a73478bbc38e97f891227b
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Dec 5 16:13:53 2020 +1000
simplify bootstrap
---
README.adoc | 2 +-
{wrapperBootstrap => bootstrap}/build.gradle | 8 +++++---
{wrapperBootstrap => bootstrap}/settings.gradle | 0
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/README.adoc b/README.adoc
index d0a56d2..61ea973 100644
--- a/README.adoc
+++ b/README.adoc
@@ -118,7 +118,7 @@ expecting.
To bootstrap Gradle, at the top directory of your unpacked source, run the command:
- gradle -p wrapperBootstrap bootstrap
+ gradle -p bootstrap
On Unix-like systems, use `./gradle`.
diff --git a/wrapperBootstrap/build.gradle b/bootstrap/build.gradle
similarity index 80%
rename from wrapperBootstrap/build.gradle
rename to bootstrap/build.gradle
index 6191fbd..2469e25 100644
--- a/wrapperBootstrap/build.gradle
+++ b/bootstrap/build.gradle
@@ -22,14 +22,16 @@ file("$projectDir/../gradle.properties").withInputStream {
props.load(it)
}
+defaultTasks 'bootstrap'
+
tasks.withType(Wrapper).configureEach {
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/"
+ 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/bootstrap/settings.gradle
similarity index 100%
rename from wrapperBootstrap/settings.gradle
rename to bootstrap/settings.gradle
[groovy] 02/02: add license headers
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 b12ea873dbb8972ff64ad8eb2f828bac6b61f815
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Dec 5 16:14:11 2020 +1000
add license headers
---
.github/SECURITY.md | 16 ++++++++++++++++
CODE_OF_CONDUCT.md | 16 ++++++++++++++++
CONTRIBUTING.md | 16 ++++++++++++++++
buildSrc/src/main/groovy/org.apache.groovy-common.gradle | 3 ++-
4 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index 36fe07a..b23507c 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -1,3 +1,19 @@
+<!--
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
# Security Policy
## Supported Versions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index dfe76ae..b4ba3d6 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,3 +1,19 @@
+<!--
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
# Community Conduct
We try to keep the Groovy community a friendly and welcoming place,
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9b4ff5c..0867926 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,19 @@
+<!--
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
# Contributing
Please visit the
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-common.gradle b/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
index 19ca032..e6aa7c2 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
@@ -73,12 +73,13 @@ tasks.named('rat') {
'**/.gradle/**', '**/wrapper/**', 'gradlew*', // gradle wrapper files excluded from src zip
'artifactory.properties', // potential file on CI server
'gradle.properties', // artifactory release plugin removes header when bumping version
- '**/build/**', 'licenses/**', 'notices/**',
+ '**/build/**', '**/target/**', 'licenses/**', 'notices/**',
'out/**', '*.ipr', '**/*.iml', '*.iws', '.idea/**', // Intellij files
'**/style.css', // MIT license as per NOTICE/LICENSE files
'**/jquery-2.1.1.min.js', // MIT license as per NOTICE/LICENSE files
'.classpath', '.project', '.settings/**', 'bin/**', // Eclipse files
'build/**',
+ 'bootstrap/settings.gradle', // empty file
'.gradle/**',
'*.iml',
'.classpath',