[gradle] resolve plexus deps

gil gil at fedoraproject.org
Sat Mar 9 12:20:18 UTC 2013


commit 04a9f119ab13a90640cefc5df28691d70d0b6686
Author: gil <puntogil at libero.it>
Date:   Sat Mar 9 13:20:09 2013 +0100

    resolve plexus deps

 gradle-1.0-build.xml |    6 +++---
 gradle.spec          |    7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/gradle-1.0-build.xml b/gradle-1.0-build.xml
index 0ced7ea..9525516 100644
--- a/gradle-1.0-build.xml
+++ b/gradle-1.0-build.xml
@@ -227,7 +227,7 @@
     <fileset dir="/usr/share/java" includes="maven/maven-settings.jar"/>
     <fileset dir="/usr/share/java" includes="plexus/containers-component-annotations.jar"/>
     <fileset dir="/usr/share/java" includes="plexus/plexus-component-api.jar"/>
-    <fileset dir="/usr/share/java" includes="plexus/containers-container-default.jar"/>
+    <fileset dir="/usr/share/java" includes="plexus/container-default.jar"/>
     <fileset dir="/usr/share/java" includes="plexus/utils.jar"/>
     <fileset dir="/usr/share/java" includes="slf4j/api.jar"/>
    </path>
@@ -332,7 +332,7 @@
     <fileset dir="/usr/share/java" includes="maven-wagon/provider-api.jar"/>
     <fileset dir="/usr/share/java" includes="plexus/containers-component-annotations.jar"/>
     <fileset dir="/usr/share/java" includes="plexus/plexus-component-api.jar"/>
-    <fileset dir="/usr/share/java" includes="plexus/containers-container-default.jar"/>
+    <fileset dir="/usr/share/java" includes="plexus/container-default.jar"/>
     <fileset dir="/usr/share/java" includes="plexus/classworlds.jar"/>
     <fileset dir="/usr/share/java" includes="plexus/interpolation.jar"/>
    </path>
@@ -1248,7 +1248,7 @@
         <fileset dir="/usr/share/java" includes="objectweb-asm/asm-all.jar"/>
         <fileset dir="/usr/share/java" includes="plexus/containers-component-annotations.jar"/>
         <fileset dir="/usr/share/java" includes="plexus/plexus-component-api.jar"/>
-        <fileset dir="/usr/share/java" includes="plexus/containers-container-default.jar"/>
+        <fileset dir="/usr/share/java" includes="plexus/container-default.jar"/>
         <fileset dir="/usr/share/java" includes="plexus/utils.jar"/>
         <fileset dir="/usr/share/java" includes="slf4j/api.jar"/>
         <fileset dir="/usr/share/java" includes="slf4j/api.jar"/>
diff --git a/gradle.spec b/gradle.spec
index fa7c921..4249371 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -30,7 +30,7 @@
 
 Name:          gradle
 Version:       1.0
-Release:       9%{?nameddottag}%{?dist}
+Release:       10%{?nameddottag}%{?dist}
 Summary:       Groovy based build system
 Group:         Development/Tools
 License:       ASL 2.0
@@ -165,7 +165,7 @@ BuildRequires: objectweb-asm
 BuildRequires: plexus-classworlds
 BuildRequires: plexus-component-api
 BuildRequires: plexus-containers-component-annotations
-BuildRequires: plexus-containers-container-default
+BuildRequires: plexus-container-default
 BuildRequires: plexus-interpolation
 BuildRequires: plexus-utils
 # TODO BuildRequires: polyglot-maven https://bugzilla.redhat.com/show_bug.cgi?id=855331
@@ -253,7 +253,7 @@ Requires:      objectweb-asm
 Requires:      plexus-classworlds
 Requires:      plexus-component-api
 Requires:      plexus-containers-component-annotations
-Requires:      plexus-containers-container-default
+Requires:      plexus-container-default
 Requires:      plexus-interpolation
 Requires:      plexus-utils
 Requires:      slf4j
@@ -363,7 +363,6 @@ done
 sed -i "s|xercesImpl:2.9.1|xerces-j2:2.9.1|" subprojects/core/core.gradle
 sed -i "s|cglib-nodep|cglib|" buildSrc/build.gradle
 sed -i "s|bndlib|aqute-bnd|" subprojects/osgi/osgi.gradle
-sed -i "s|plexus/container-default|plexus/containers-container-default|" subprojects/core-impl/core-impl.gradle
 
 # groovydoc (more complete than javadoc) task could derail the compilation (requires groovy-all.jar) docs:userguide 
 gradle --full-stacktrace --debug assemble javadoc \


More information about the scm-commits mailing list