Blob Blame History Raw
From bfbe87541982e7e0a8d22f7c890be419010a5626 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 28 Apr 2015 11:35:17 +0200
Subject: [PATCH 10/13] Remove S3 plugin

S3 plugin depends on non-free AWS SDK library.  For more details see
https://discuss.gradle.org/t/gradle-2-4-rc1-introduces-a-non-free-dependency/9351
---
 build.gradle                                                   | 2 +-
 gradle/buildSplits.gradle                                      | 2 +-
 settings.gradle                                                | 1 -
 subprojects/dependency-management/dependency-management.gradle | 1 -
 subprojects/ivy/ivy.gradle                                     | 1 -
 subprojects/maven/maven.gradle                                 | 1 -
 6 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4e26005..128fb0a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -146,7 +146,7 @@ ext {
         'platformJvm', 'languageJvm', 'languageJava', 'languageGroovy', 'languageScala',
         'platformNative', 'platformPlay', 'languageNative', 'ideNative', 'testingBase',
         'testingNative', 'testingJvm', 'pluginDevelopment', 'pluginUse', 'resourcesHttp',
-        'resourcesSftp', 'resourcesS3', 'toolingApiBuilders'
+        'resourcesSftp', 'toolingApiBuilders'
     ].collect {
         project(it)
     }
diff --git a/gradle/buildSplits.gradle b/gradle/buildSplits.gradle
index b631926..4436746 100644
--- a/gradle/buildSplits.gradle
+++ b/gradle/buildSplits.gradle
@@ -26,7 +26,7 @@ def buckets = [
 
     "3": [":launcher", ":plugins", ":codeQuality", ":languageJava", ":testingBase", ":testingJvm",
         ":ui", ":javascript", ":antlr", ":messaging", ":ear",
-        ":resourcesS3", ":wrapper", ":resourcesSftp", ":signing", ":modelGroovy", ":baseServices"],
+        ":wrapper", ":resourcesSftp", ":signing", ":modelGroovy", ":baseServices"],
 
     "4": [":docs", ":integTest", ":core", ":languageNative", ":ide", ":platformJvm", ":platformNative",
           ":modelCore", ":sonar", ":maven", ":testingNative", ":ideNative", ":native"]
diff --git a/settings.gradle b/settings.gradle
index fad45e6..099a56b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -24,7 +24,6 @@ include 'launcher'
 include 'messaging'
 include 'resources'
 include 'resourcesHttp'
-include 'resourcesS3'
 include 'resourcesSftp'
 include 'plugins'
 include 'scala'
diff --git a/subprojects/dependency-management/dependency-management.gradle b/subprojects/dependency-management/dependency-management.gradle
index 7b07e34..e73dc2b 100644
--- a/subprojects/dependency-management/dependency-management.gradle
+++ b/subprojects/dependency-management/dependency-management.gradle
@@ -27,7 +27,6 @@ dependencies {
     integTestRuntime project(":ivy")
     integTestRuntime project(":maven")
     integTestRuntime project(":resourcesHttp")
-    integTestRuntime project(":resourcesS3")
     integTestRuntime project(":resourcesSftp")
     //this dependency is necessary to run IvySFtpResolverIntegrationTest on ibm jdk
     //integTestRuntime "org.bouncycastle:bcprov-jdk15:1.46@jar"
diff --git a/subprojects/ivy/ivy.gradle b/subprojects/ivy/ivy.gradle
index 4cdf2c4..93e2c59 100644
--- a/subprojects/ivy/ivy.gradle
+++ b/subprojects/ivy/ivy.gradle
@@ -24,7 +24,6 @@ dependencies {
 
     testCompile libraries.groovy
     integTestCompile project(":ear")
-    integTestRuntime project(":resourcesS3")
     integTestRuntime project(":resourcesSftp")
     testFixturesCompile project(":internalIntegTesting")
 }
diff --git a/subprojects/maven/maven.gradle b/subprojects/maven/maven.gradle
index ddfb2d7..9190bcf 100644
--- a/subprojects/maven/maven.gradle
+++ b/subprojects/maven/maven.gradle
@@ -31,7 +31,6 @@ dependencies {
     testCompile libraries.xmlunit
 
     integTestCompile project(":ear")
-    integTestRuntime project(":resourcesS3")
     integTestRuntime project(":resourcesSftp")
 
     testFixturesCompile project(":internalIntegTesting")
-- 
2.5.0