mizdebsk pushed to gradle (master). "Remove S3 plugin (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon May 4 07:54:45 UTC 2015 

>From 363dccf527886a4ecd924455916b3b0fa37bad81 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue, 28 Apr 2015 11:31:54 +0200
Subject: 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

diff --git a/0001-Gradle-local-mode.patch b/0001-Gradle-local-mode.patch
index 107ea23..b221cdb 100644
--- a/0001-Gradle-local-mode.patch
+++ b/0001-Gradle-local-mode.patch
@@ -1,7 +1,7 @@
 From 40a860a490da856d7aa162c2801999e70e17a9bf Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Wed, 15 Oct 2014 14:23:30 +0200
-Subject: [PATCH 01/15] Gradle local mode
+Subject: [PATCH 01/16] Gradle local mode
 
 ---
  build.gradle                                         | 1 +
diff --git a/0002-Use-Maven-Wagon-2.8.patch b/0002-Use-Maven-Wagon-2.8.patch
index 677fda3..9788faa 100644
--- a/0002-Use-Maven-Wagon-2.8.patch
+++ b/0002-Use-Maven-Wagon-2.8.patch
@@ -1,7 +1,7 @@
 From 80c107fa032534edd92c637c9514d8e35a47ec05 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Mon, 20 Oct 2014 15:08:43 +0200
-Subject: [PATCH 02/15] Use Maven Wagon 2.8
+Subject: [PATCH 02/16] Use Maven Wagon 2.8
 
 ---
  gradle/dependencies.gradle | 6 +++---
diff --git a/0003-Use-bndlib-1.50.0.patch b/0003-Use-bndlib-1.50.0.patch
index e097b74..4f15575 100644
--- a/0003-Use-bndlib-1.50.0.patch
+++ b/0003-Use-bndlib-1.50.0.patch
@@ -1,7 +1,7 @@
 From 848c02c7f72266b8ddb3e0571897cc6b107a8638 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Wed, 22 Oct 2014 12:35:24 +0200
-Subject: [PATCH 03/15] Use bndlib 1.50.0
+Subject: [PATCH 03/16] Use bndlib 1.50.0
 
 ---
  subprojects/osgi/osgi.gradle                                          | 2 +-
diff --git a/0004-Port-to-Jetty-9.patch b/0004-Port-to-Jetty-9.patch
index f04ebb1..609dff2 100644
--- a/0004-Port-to-Jetty-9.patch
+++ b/0004-Port-to-Jetty-9.patch
@@ -1,7 +1,7 @@
 From 6268673cfaa00b22cfe5f1bd9632a19951fb8a62 Mon Sep 17 00:00:00 2001
 From: Michal Srb <msrb at redhat.com>
 Date: Fri, 31 Oct 2014 09:01:47 +0100
-Subject: [PATCH 04/15] Port to Jetty 9
+Subject: [PATCH 04/16] Port to Jetty 9
 
 Initial attempt
 ---
diff --git a/0005-Use-jansi-1.11.patch b/0005-Use-jansi-1.11.patch
index c80b4f4..4af8bde 100644
--- a/0005-Use-jansi-1.11.patch
+++ b/0005-Use-jansi-1.11.patch
@@ -1,7 +1,7 @@
 From 379fe10a3d7abc1c82b55ac3437fae67b8ac9d60 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Fri, 7 Nov 2014 15:02:11 +0100
-Subject: [PATCH 05/15] Use jansi 1.11
+Subject: [PATCH 05/16] Use jansi 1.11
 
 ---
  subprojects/native/native.gradle | 2 +-
diff --git a/0006-Remove-Class-Path-from-manifest.patch b/0006-Remove-Class-Path-from-manifest.patch
index 505e306..9e1343d 100644
--- a/0006-Remove-Class-Path-from-manifest.patch
+++ b/0006-Remove-Class-Path-from-manifest.patch
@@ -1,7 +1,7 @@
 From 3faf740347a1253177490547faa053c81df04363 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Sun, 9 Nov 2014 17:52:30 +0100
-Subject: [PATCH 06/15] Remove Class-Path from manifest
+Subject: [PATCH 06/16] Remove Class-Path from manifest
 
 ---
  .../api/internal/classpath/DefaultModuleRegistry.java       | 13 +------------
diff --git a/0007-Implement-XMvn-repository-factory-method.patch b/0007-Implement-XMvn-repository-factory-method.patch
index 81b72f3..e4c0654 100644
--- a/0007-Implement-XMvn-repository-factory-method.patch
+++ b/0007-Implement-XMvn-repository-factory-method.patch
@@ -1,7 +1,7 @@
 From 3ff819fea9bf29a5f6fb1b0ad641764662f78463 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Sun, 9 Nov 2014 21:37:37 +0100
-Subject: [PATCH 07/15] Implement XMvn repository factory method
+Subject: [PATCH 07/16] Implement XMvn repository factory method
 
 ---
  .../internal/artifacts/BaseRepositoryFactory.java  |  3 ++
diff --git a/0008-Add-build-dependency-on-ASM-5.0.3.patch b/0008-Add-build-dependency-on-ASM-5.0.3.patch
index 2ea8e86..f05a6bb 100644
--- a/0008-Add-build-dependency-on-ASM-5.0.3.patch
+++ b/0008-Add-build-dependency-on-ASM-5.0.3.patch
@@ -1,7 +1,7 @@
 From 1c12893d6187f16e79dd3f2184946826676559e8 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Tue, 20 Jan 2015 12:30:09 +0100
-Subject: [PATCH 08/15] Add build dependency on ASM 5.0.3
+Subject: [PATCH 08/16] Add build dependency on ASM 5.0.3
 
 In Fedora ASM was unbundled from Jar Jar, so it needs to be explicitly
 added as dependency.
diff --git a/0009-Port-from-Simple-4-to-Jetty-9.patch b/0009-Port-from-Simple-4-to-Jetty-9.patch
index 6f0d8ff..68e85a7 100644
--- a/0009-Port-from-Simple-4-to-Jetty-9.patch
+++ b/0009-Port-from-Simple-4-to-Jetty-9.patch
@@ -1,7 +1,7 @@
 From 43ec2a29258af9c241e03210acd3fdb247a56d94 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Fri, 30 Jan 2015 13:16:40 +0100
-Subject: [PATCH 09/15] Port from Simple 4 to Jetty 9
+Subject: [PATCH 09/16] Port from Simple 4 to Jetty 9
 
 ---
  subprojects/javascript/javascript.gradle           |  2 +-
diff --git a/0010-Use-unversioned-dependency-JAR-names.patch b/0010-Use-unversioned-dependency-JAR-names.patch
index e9cae44..6e7b46d 100644
--- a/0010-Use-unversioned-dependency-JAR-names.patch
+++ b/0010-Use-unversioned-dependency-JAR-names.patch
@@ -1,7 +1,7 @@
 From c543c513f3ccea9119439f8462c88835b088ae84 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek at redhat.com>
 Date: Sat, 7 Feb 2015 15:28:03 +0100
-Subject: [PATCH 10/15] Use unversioned dependency JAR names
+Subject: [PATCH 10/16] Use unversioned dependency JAR names
 
 ---
  gradle/groovyProject.gradle                               | 15 +++++++++++++--
diff --git a/0011-Don-t-declare-dependency-on-jarjars.patch b/0011-Don-t-declare-dependency-on-jarjars.patch
index 5fe1caa..19a70b2 100644
--- a/0011-Don-t-declare-dependency-on-jarjars.patch
+++ b/0011-Don-t-declare-dependency-on-jarjars.patch
@@ -1,7 +1,7 @@
 From fe61b663dee3798e6517c51024204204c99269c8 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek at redhat.com>
 Date: Sat, 7 Feb 2015 17:43:40 +0100
-Subject: [PATCH 11/15] Don't declare dependency on jarjars
+Subject: [PATCH 11/16] Don't declare dependency on jarjars
 
 ---
  subprojects/dependency-management/dependency-management.gradle | 6 +-----
diff --git a/0012-Port-to-Ivy-2.4.0.patch b/0012-Port-to-Ivy-2.4.0.patch
index 95cda8f..14b1262 100644
--- a/0012-Port-to-Ivy-2.4.0.patch
+++ b/0012-Port-to-Ivy-2.4.0.patch
@@ -1,7 +1,7 @@
 From c7d8c4f65e3c70c733328b1503c8cb876a9a9999 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Mon, 13 Apr 2015 12:27:00 +0200
-Subject: [PATCH 12/15] Port to Ivy 2.4.0
+Subject: [PATCH 12/16] Port to Ivy 2.4.0
 
 ---
  .../ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java  | 2 +-
diff --git a/0013-Port-to-Polyglot-0.1.8.patch b/0013-Port-to-Polyglot-0.1.8.patch
index 96ad224..dd05146 100644
--- a/0013-Port-to-Polyglot-0.1.8.patch
+++ b/0013-Port-to-Polyglot-0.1.8.patch
@@ -1,7 +1,7 @@
 From 2a4fb882396ddaaa5e0565ef7db43125053dabb5 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Tue, 21 Apr 2015 15:12:44 +0200
-Subject: [PATCH 13/15] Port to Polyglot 0.1.8
+Subject: [PATCH 13/16] Port to Polyglot 0.1.8
 
 ---
  .../maven/internal/pom/CustomModelBuilder.java          | 17 ++++++++++-------
diff --git a/0014-Remove-support-for-Zinc-compiler.patch b/0014-Remove-support-for-Zinc-compiler.patch
index 636ad9b..f9052f3 100644
--- a/0014-Remove-support-for-Zinc-compiler.patch
+++ b/0014-Remove-support-for-Zinc-compiler.patch
@@ -1,7 +1,7 @@
 From 56187854420b2ee643f79e2eaf43319e98b4bc83 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Fri, 24 Apr 2015 10:18:37 +0200
-Subject: [PATCH 14/15] Remove support for Zinc compiler
+Subject: [PATCH 14/16] Remove support for Zinc compiler
 
 ---
  subprojects/language-scala/language-scala.gradle   |   1 -
diff --git a/0015-Port-to-Maven-3.3.3.patch b/0015-Port-to-Maven-3.3.3.patch
index 32b6487..ff09d6f 100644
--- a/0015-Port-to-Maven-3.3.3.patch
+++ b/0015-Port-to-Maven-3.3.3.patch
@@ -1,7 +1,7 @@
-From 59b0729c632aed26b010ecc2e041f0f04414fcc4 Mon Sep 17 00:00:00 2001
+From 3ed246d67406ba157c9e339838e9bd89bce4efd7 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Fri, 24 Apr 2015 09:59:58 +0200
-Subject: [PATCH 15/15] Port to Maven 3.3.3
+Subject: [PATCH 15/16] Port to Maven 3.3.3
 
 ---
  gradle/dependencies.gradle                         |  62 +++----
@@ -12,7 +12,7 @@ Subject: [PATCH 15/15] Port to Maven 3.3.3
  .../mvnsettings/DefaultMavenSettingsProvider.java  |   4 +-
  .../mvnsettings/MavenSettingsProvider.java         |   4 +-
  subprojects/maven/maven.gradle                     |   2 +-
- .../action/AbstractMavenPublishAction.java         | 196 ++++++++-------------
+ .../action/AbstractMavenPublishAction.java         | 195 ++++++++-------------
  .../maven/internal/action/MavenDeployAction.java   |  73 +++-----
  .../maven/internal/action/MavenInstallAction.java  |  31 ++--
  .../internal/action/MavenWagonDeployAction.java    |   7 +-
@@ -23,7 +23,7 @@ Subject: [PATCH 15/15] Port to Maven 3.3.3
  .../maven/internal/wagon/WagonRegistry.java        |   6 +-
  .../publisher/ValidatingMavenPublisher.java        |   6 +-
  .../publisher/ValidatingMavenPublisherTest.groovy  |   2 +-
- 19 files changed, 196 insertions(+), 257 deletions(-)
+ 19 files changed, 195 insertions(+), 257 deletions(-)
 
 diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
 index 0134f8b..da56f9a 100755
@@ -244,10 +244,10 @@ index 3132f63..ddfb2d7 100644
      compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
      compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
 diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java
-index f8a4ad9..2037423 100644
+index f8a4ad9..87068bb 100644
 --- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java
 +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java
-@@ -16,45 +16,46 @@
+@@ -16,45 +16,45 @@
  
  package org.gradle.api.publication.maven.internal.action;
  
@@ -281,7 +281,6 @@ index f8a4ad9..2037423 100644
 +import org.codehaus.plexus.classworlds.realm.ClassRealm;
  import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 -import org.codehaus.plexus.embed.Embedder;
-+import org.eclipse.aether.ConfigurationProperties;
 +import org.eclipse.aether.DefaultRepositoryCache;
 +import org.eclipse.aether.DefaultRepositorySystemSession;
 +import org.eclipse.aether.RepositorySystem;
@@ -304,8 +303,8 @@ index f8a4ad9..2037423 100644
 -    private File mainArtifact;
 +    private final ParsedMavenPom pom;
 +    private final List<Artifact> attached = new ArrayList<Artifact>();
++    private final Artifact pomArtifact;
 +    private Artifact mainArtifact;
-+    private Artifact pomArtifact;
  
      private File localMavenRepository;
      private PlexusContainer container;
@@ -322,7 +321,7 @@ index f8a4ad9..2037423 100644
      }
  
      public void setLocalMavenRepositoryLocation(File localMavenRepository) {
-@@ -62,139 +63,94 @@ abstract class AbstractMavenPublishAction implements MavenPublishAction {
+@@ -62,139 +62,94 @@ abstract class AbstractMavenPublishAction implements MavenPublishAction {
      }
  
      public void setMainArtifact(File file) {
diff --git a/gradle-bootstrap-module-list b/gradle-bootstrap-module-list
index 7f991f7..665f2f6 100644
--- a/gradle-bootstrap-module-list
+++ b/gradle-bootstrap-module-list
@@ -50,4 +50,3 @@ gradle-antlr
 gradle-ivy
 gradle-platform-play
 gradle-tooling-api-builders
-gradle-resources-s3
diff --git a/gradle-bootstrap.sh b/gradle-bootstrap.sh
index bd64f3e..4161019 100755
--- a/gradle-bootstrap.sh
+++ b/gradle-bootstrap.sh
@@ -32,9 +32,6 @@ apache-commons-configuration
 apache-commons-lang
 apache-ivy/ivy
 aqute-bndlib
-aws-sdk-java/aws-java-sdk-core
-aws-sdk-java/aws-java-sdk-kms
-aws-sdk-java/aws-java-sdk-s3
 atinject
 base64coder
 bcpg
diff --git a/gradle.spec b/gradle.spec
index 854b841..a0993fc 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -61,6 +61,7 @@ Patch12:        0013-Port-to-Polyglot-0.1.8.patch
 Patch13:        0014-Remove-support-for-Zinc-compiler.patch
 # Accepted upstream: https://github.com/gradle/gradle/pull/443
 Patch14:        0015-Port-to-Maven-3.3.3.patch
+Patch15:        0016-Remove-S3-plugin.patch
 
 # Dependencies on build system used.  In bootstrap mode we use plain
 # groovyc to compile Gradle, otherwise Gradle is built with itself.
@@ -86,9 +87,6 @@ BuildRequires:  mvn(cglib:cglib)
 BuildRequires:  mvn(cglib:cglib-nodep)
 BuildRequires:  mvn(ch.qos.logback:logback-classic)
 BuildRequires:  mvn(ch.qos.logback:logback-core)
-BuildRequires:  mvn(com.amazonaws:aws-java-sdk-core)
-BuildRequires:  mvn(com.amazonaws:aws-java-sdk-kms)
-BuildRequires:  mvn(com.amazonaws:aws-java-sdk-s3)
 BuildRequires:  mvn(com.beust:jcommander)
 BuildRequires:  mvn(com.esotericsoftware.kryo:kryo)
 BuildRequires:  mvn(com.esotericsoftware.minlog:minlog)
@@ -293,7 +291,6 @@ Requires:       apache-commons-logging
 Requires:       apache-ivy
 Requires:       aqute-bndlib
 Requires:       atinject
-Requires:       aws-sdk-java
 Requires:       base64coder
 Requires:       bea-stax
 Requires:       bea-stax-api
@@ -429,6 +426,7 @@ legacy automation challenges.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # Remove bundled wrapper JAR
 rm -rf gradle/wrapper/
@@ -504,7 +502,7 @@ for f in gradle-base-services gradle-base-services-groovy gradle-cli gradle-core
          plugins/gradle-platform-jvm plugins/gradle-platform-native plugins/gradle-plugin-development \
          plugins/gradle-plugins plugins/gradle-plugin-use plugins/gradle-publish plugins/gradle-reporting \
          plugins/gradle-resources-http plugins/gradle-scala plugins/gradle-signing plugins/gradle-sonar \
-         plugins/gradle-language-scala plugins/gradle-platform-play plugins/gradle-resources-s3 \
+         plugins/gradle-language-scala plugins/gradle-platform-play \
          plugins/gradle-resources-sftp plugins/gradle-testing-native plugins/gradle-tooling-api-builders
 do
     mod=$(basename $f)
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gradle.git/commit/?h=master&id=363dccf527886a4ecd924455916b3b0fa37bad81

More information about the scm-commits mailing list