[gradle] Add missing maven-ant-tasks dependencies
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Nov 18 20:12:07 UTC 2014
commit 417f42bd0fbb2f1c239506d46007e3f96dba56fc
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri Oct 31 11:31:47 2014 +0100
Add missing maven-ant-tasks dependencies
0007-Use-unshaded-Maven-Ant-Tasks.patch | 29 ++++++++++++++++++++++-------
gradle.spec | 5 ++++-
2 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/0007-Use-unshaded-Maven-Ant-Tasks.patch b/0007-Use-unshaded-Maven-Ant-Tasks.patch
index 7c06792..5253fa3 100644
--- a/0007-Use-unshaded-Maven-Ant-Tasks.patch
+++ b/0007-Use-unshaded-Maven-Ant-Tasks.patch
@@ -1,34 +1,49 @@
-From efceece39f762d0a13745a4a37a0c7662ab18a84 Mon Sep 17 00:00:00 2001
+From e81b1e1a9bc1a1b7cf9a10118b1014b69c44d571 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri, 31 Oct 2014 09:23:37 +0100
Subject: [PATCH 7/7] Use unshaded Maven Ant Tasks
---
- gradle/dependencies.gradle | 13 +++++++++++++
- .../gradle/api/internal/artifacts/PlexusLoggerAdapter.java | 8 ++++++++
- .../publication/maven/internal/ant/BaseMavenDeployer.java | 4 ++--
- 3 files changed, 23 insertions(+), 2 deletions(-)
+ gradle/dependencies.gradle | 28 ++++++++++++++++++++++
+ .../internal/artifacts/PlexusLoggerAdapter.java | 8 +++++++
+ .../maven/internal/ant/BaseMavenDeployer.java | 4 ++--
+ 3 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
-index b26d217..3deabdd 100755
+index b26d217..f941135 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
-@@ -74,6 +74,19 @@ libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:ht
+@@ -74,6 +74,34 @@ libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:ht
libraries.maven_ant_tasks = dependencies.module("org.apache.maven:maven-ant-tasks:2.1.3") {
libraries.ant
+ dependency "org.codehaus.plexus:plexus-classworlds:2.5.2 at jar"
+ dependency "org.codehaus.plexus:plexus-container-default:1.5.5 at jar"
++ dependency "org.apache.xbean:xbean-reflect:3.4 at jar"
++ dependency "log4j:log4j:1.2.12 at jar"
++ dependency "javax.mail:mail:1.5.3 at jar"
++ dependency "org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.0 at jar"
++ dependency "commons-logging:commons-logging-api:1.1 at jar"
++ dependency "com.google.collections:google-collections:1.0 at jar"
++ dependency "com.google.code.findbugs:jsr305:1.3.9 at jar"
+ dependency "org.codehaus.plexus:plexus-utils:1.5.15 at jar"
+ dependency "org.codehaus.plexus:plexus-interpolation:1.11 at jar"
+ dependency "org.apache.maven:maven-artifact:2.2.1 at jar"
+ dependency "org.apache.maven:maven-artifact-manager:2.2.1 at jar"
++ dependency "org.apache.maven:maven-repository-metadata:2.2.1 at jar"
+ dependency "org.apache.maven:maven-model:2.2.1 at jar"
++ dependency "org.apache.maven:maven-model-builder:2.2.1 at jar"
+ dependency "org.apache.maven:maven-project:2.2.1 at jar"
++ dependency "org.apache.maven:maven-profile:2.2.1 at jar"
++ dependency "org.apache.maven:maven-plugin-registry:2.2.1 at jar"
+ dependency "org.apache.maven:maven-error-diagnostics:2.2.1 at jar"
+ dependency "org.apache.maven:maven-settings:2.2.1 at jar"
+ dependency "org.apache.maven.wagon:wagon-file:1.0-beta-6 at jar"
++ dependency "commons-lang:commons-lang:2.6 at jar"
+ dependency "org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6 at jar"
++ dependency "org.apache.maven.wagon:wagon-http-shared:2.7 at jar"
++ dependency "org.jsoup:jsoup:1.7.2 at jar"
++ dependency "commons-io:commons-io:2.2 at jar"
+ dependency "org.apache.maven.wagon:wagon-provider-api:1.0-beta-6 at jar"
}
diff --git a/gradle.spec b/gradle.spec
index c429d98..7d2e653 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -4,7 +4,7 @@
Name: gradle
Version: 2.1
-Release: 0.23%{?dist}
+Release: 0.24%{?dist}
Summary: Build automation tool
# Some examples and integration tests are under GNU LGPL and Boost
# Software License, but are not used to create binary package.
@@ -214,6 +214,9 @@ jar cfm %{buildroot}%{_datadir}/%{name}/lib/plugins/gradle-core-impl-2.1*.jar ME
%doc LICENSE NOTICE
%changelog
+* Fri Oct 31 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1-0.24
+- Add missing maven-ant-tasks dependencies
+
* Fri Oct 31 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1-0.23
- Bump BR on gradle-deps
- Fix BR on jetty
More information about the scm-commits
mailing list