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/10/09 23:06:45 UTC

[groovy] branch master updated (dc448f7 -> 0bcc67f)

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 dc448f7  add missing header files
     new c23922e  remove unused signing keys
     new 0bcc67f  add missing parts to src zip

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-common.gradle  |   1 -
 security/groovy.policy                               |   5 +++--
 security/groovykeys                                  | Bin 895 -> 0 bytes
 subprojects/groovy-binary/build.gradle               |  19 +++++++++++++------
 4 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 security/groovykeys


[groovy] 02/02: add missing parts to src zip

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 0bcc67fe53d0af2a578358faaa24306c05e5b41a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Oct 10 09:06:34 2020 +1000

    add missing parts to src zip
---
 subprojects/groovy-binary/build.gradle | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/subprojects/groovy-binary/build.gradle b/subprojects/groovy-binary/build.gradle
index 5d03d45..d68964f 100644
--- a/subprojects/groovy-binary/build.gradle
+++ b/subprojects/groovy-binary/build.gradle
@@ -146,15 +146,20 @@ distribution {
                 }
             }
         }
+        into('subprojects/parser-antlr4') {
+            from(file("${project.projectDir}/subprojects/parser-antlr4"))
+        }
         ['xdocs',
          'config',
          'buildSrc',
          'licenses',
          'notices',
          'security',
+         'gradle',
          'src',
          'build.gradle',
          'settings.gradle',
+         'gradle.properties',
          'LICENSE',
          'NOTICE',
          'README.adoc',
@@ -166,12 +171,14 @@ distribution {
                 }
                 exclude 'build',
                         'target',
-                        '**/*.iml',         // used by Intellij IDEA
-                        '**/*.ipr',         // used by Intellij IDEA
-                        '**/*.iws',         // used by Intellij IDEA
-                        '.settings',        // used by Eclipse
-                        '.classpath',        // used by Eclipse
-                        '.gradle'        // used by Gradle
+                        'wrapper',        // used by Gradle
+                        '**/*.iml',       // used by Intellij IDEA
+                        '**/*.ipr',       // used by Intellij IDEA
+                        '**/*.iws',       // used by Intellij IDEA
+                        '.settings',      // used by Eclipse
+                        '.classpath',     // used by Eclipse
+                        '.gradle'         // used by Gradle
+                        '*/*.gpg'         // used by Gradle
             }
         }
     }


[groovy] 01/02: remove unused signing keys

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 c23922ecb0aa9f240a3f83b53afabd85f83ce4f3
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Oct 10 09:06:07 2020 +1000

    remove unused signing keys
---
 buildSrc/src/main/groovy/org.apache.groovy-common.gradle |   1 -
 security/groovy.policy                                   |   5 +++--
 security/groovykeys                                      | Bin 895 -> 0 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/groovy/org.apache.groovy-common.gradle b/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
index 6329bf8..19ca032 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
@@ -70,7 +70,6 @@ tasks.named('rat') {
                 'config/**',
                 'src/install/**', // CI file excluded from src zip
                 'src/test/org/codehaus/groovy/ast/LineColumnCheck.txt', // test file
-                'security/groovykeys', // excluded from src zip
                 '**/.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
diff --git a/security/groovy.policy b/security/groovy.policy
index 070e4bd..81098dc 100644
--- a/security/groovy.policy
+++ b/security/groovy.policy
@@ -26,14 +26,15 @@
  *  MetaMethod.createMetaMethod
  *  MetaMethod.invoke(Object Object[])
  *  ReflectionMetaMethod.invoke(Object Object[])
- *  DefaultGoovyMethods.dump(Object)
+ *  DefaultGroovyMethods.dump(Object)
  */
 
 /*
  * This keystore contains the public key of the pair used to sign GroovyTestJar.jar
  * See SecurityTest.testReadSignedJar()
  */
-keystore "file:${user.dir}/security/groovykeys";
+// NOT CURRENTLY LONGER USED!
+//keystore "file:${user.dir}/security/groovykeys";
 
 /*
  * ================= Codebases requiring java.security.AllPermission ===============
diff --git a/security/groovykeys b/security/groovykeys
deleted file mode 100644
index 4fc24da..0000000
Binary files a/security/groovykeys and /dev/null differ