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/09/20 08:27:38 UTC

[groovy] branch GROOVY_3_0_X updated: GROOVY-9688: Groovy 3.0.5 references groovyjarjaropenbeans.BeanInfo

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
     new 99f7dd6  GROOVY-9688: Groovy 3.0.5 references groovyjarjaropenbeans.BeanInfo
99f7dd6 is described below

commit 99f7dd6328a5cd2aa8eee992d4a2259c0361de27
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Sep 20 18:25:42 2020 +1000

    GROOVY-9688: Groovy 3.0.5 references groovyjarjaropenbeans.BeanInfo
---
 build.gradle           | 8 +++++++-
 gradle/assemble.gradle | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 470c011..8b5b037 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,7 +87,12 @@ allprojects {
         }
         jcenter()
 //        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
-        maven { url 'https://dl.bintray.com/melix/thirdparty-apache' } // openbeans
+        maven { // openbeans
+            url 'https://dl.bintray.com/melix/thirdparty-apache'
+            metadataSources {
+                artifact()
+            }
+        }
 //        mavenLocal()
     }
 
@@ -177,6 +182,7 @@ dependencies {
         exclude(group: 'jmock', module: 'jmock')
         exclude(group: 'xmlpull', module: 'xmlpull')
     }
+    implementation "com.googlecode:openbeans:$openbeansVersion"
     implementation "org.fusesource.jansi:jansi:$jansiVersion"
     implementation("org.apache.ivy:ivy:$ivyVersion") {
         transitive = false
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index d4247ab..1af500d 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -260,7 +260,7 @@ allprojects {
             dependsOn jarjar
             from = file(jarjar.outputFile)
             if (isRoot) {
-                repackagedLibraries = files(configurations.runtime.incoming.artifactView {
+                repackagedLibraries = files(configurations.runtimeClasspath.incoming.artifactView {
                     componentFilter { component ->
                         if (component instanceof ModuleComponentIdentifier) {
                             return component.module in ['openbeans']