mizdebsk pushed to gradle (master). "Update to upstream version 2.3"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Mar 25 07:28:08 UTC 2015
>From ab8e6eec724d3d4e0b36387511286344a2f8ed08 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed, 25 Mar 2015 08:06:27 +0100
Subject: Update to upstream version 2.3
diff --git a/.gitignore b/.gitignore
index 91f95c1..9ebb348 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/gradle-2.2-src.zip
/all-released-versions.json
/gradle-2.2.1-src.zip
+/gradle-2.3-src.zip
diff --git a/0001-Gradle-local-mode.patch b/0001-Gradle-local-mode.patch
index 5f24458..f56aa64 100644
--- a/0001-Gradle-local-mode.patch
+++ b/0001-Gradle-local-mode.patch
@@ -1,4 +1,4 @@
-From 65a9bbf9af98fa63eb1a52acac4401870d3b5a00 Mon Sep 17 00:00:00 2001
+From 966adce0b739e23161d047055f023a16568a97a6 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/14] Gradle local mode
@@ -13,10 +13,10 @@ Subject: [PATCH 01/14] Gradle local mode
6 files changed, 6 insertions(+)
diff --git a/build.gradle b/build.gradle
-index 4b40e97..a6c4c03 100644
+index 52185c1..d39498a 100644
--- a/build.gradle
+++ b/build.gradle
-@@ -127,6 +127,7 @@ allprojects {
+@@ -128,6 +128,7 @@ allprojects {
group = 'org.gradle'
repositories {
@@ -25,7 +25,7 @@ index 4b40e97..a6c4c03 100644
}
}
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
-index 9e03b4f..138b851 100644
+index 1dce84e..0ee5bc6 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -21,6 +21,7 @@ apply plugin: 'idea'
@@ -37,7 +37,7 @@ index 9e03b4f..138b851 100644
mavenCentral()
}
diff --git a/subprojects/docs/docs.gradle b/subprojects/docs/docs.gradle
-index b0b6ab2..4985b3b 100755
+index 7f80578..99dfa4d 100755
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
@@ -31,6 +31,7 @@ apply plugin: 'jsoup'
diff --git a/0002-Use-Maven-Wagon-2.8.patch b/0002-Use-Maven-Wagon-2.8.patch
index d8aea9a..9bf035b 100644
--- a/0002-Use-Maven-Wagon-2.8.patch
+++ b/0002-Use-Maven-Wagon-2.8.patch
@@ -1,4 +1,4 @@
-From a751e554a906a8d21eee4be0d1ffe98f2a7f0247 Mon Sep 17 00:00:00 2001
+From d2f61b8a0f76bc00b9d380add444e18dc9c943ea 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/14] Use Maven Wagon 2.8
@@ -8,7 +8,7 @@ Subject: [PATCH 02/14] Use Maven Wagon 2.8
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
-index 19d3ad0..14a360f 100755
+index 1ba0641..c97c894 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -125,9 +125,9 @@ libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
diff --git a/0003-Use-bndlib-1.50.0.patch b/0003-Use-bndlib-1.50.0.patch
index 945673c..91a0cd6 100644
--- a/0003-Use-bndlib-1.50.0.patch
+++ b/0003-Use-bndlib-1.50.0.patch
@@ -1,4 +1,4 @@
-From b0cdc857c13b7ab5ee3ca7137f7c59f80d0319f3 Mon Sep 17 00:00:00 2001
+From f1a001821e07b1f527254d6c90f7c580391dce1c 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/14] Use bndlib 1.50.0
diff --git a/0004-Port-to-Jetty-9.patch b/0004-Port-to-Jetty-9.patch
index 113ed50..4fa95a1 100644
--- a/0004-Port-to-Jetty-9.patch
+++ b/0004-Port-to-Jetty-9.patch
@@ -1,11 +1,11 @@
-From deb4e9c651d21930fa31ee6aec392c25fcfa3111 Mon Sep 17 00:00:00 2001
+From 5ee89f3a1facbcc9f7b19024979b8e50a92cfdbd 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/14] Port to Jetty 9
Initial attempt
---
- gradle/dependencies.gradle | 8 +-
+ gradle/dependencies.gradle | 6 +-
subprojects/jetty/jetty.gradle | 23 +++--
.../api/plugins/jetty/AbstractJettyRunTask.java | 18 ++--
.../org/gradle/api/plugins/jetty/JettyRun.java | 18 ++--
@@ -15,13 +15,13 @@ Initial attempt
.../plugins/jetty/internal/JettyPluginServer.java | 2 +-
.../jetty/internal/JettyPluginWebAppContext.java | 16 ++--
.../gradle/api/plugins/jetty/internal/Monitor.java | 2 +-
- 10 files changed, 89 insertions(+), 145 deletions(-)
+ 10 files changed, 88 insertions(+), 144 deletions(-)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
-index 14a360f..0c66ac1 100755
+index c97c894..11a80eb 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
-@@ -57,12 +57,12 @@ libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic:
+@@ -59,12 +59,12 @@ libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic:
}
// Jetty
@@ -37,13 +37,6 @@ index 14a360f..0c66ac1 100755
dependency libraries.jetty_util
dependency libraries.servlet_api
}
-@@ -165,4 +165,4 @@ allprojects {
- }
- }
- }
--}
-\ No newline at end of file
-+}
diff --git a/subprojects/jetty/jetty.gradle b/subprojects/jetty/jetty.gradle
index 8b8e054..06e2367 100644
--- a/subprojects/jetty/jetty.gradle
diff --git a/0005-Use-jansi-1.11.patch b/0005-Use-jansi-1.11.patch
index 7facfc1..64fdb06 100644
--- a/0005-Use-jansi-1.11.patch
+++ b/0005-Use-jansi-1.11.patch
@@ -1,4 +1,4 @@
-From 291e2fb748f6927eae4ffead739bf223dd871063 Mon Sep 17 00:00:00 2001
+From 24464fa20b014d0f36ba45f4ab454f6d96c5d3ec 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/14] Use jansi 1.11
diff --git a/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch b/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
index bb70023..85e1c21 100644
--- a/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
+++ b/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
@@ -1,4 +1,4 @@
-From 5afd16dc00e401d6f5aa4e6d97960ba5621d84de Mon Sep 17 00:00:00 2001
+From 3aee4ddfc050d5d28a51ebab40e0cc853a9444ea 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 06/14] Port to Maven 3.1.1 and Aether Ant Tasks
@@ -29,12 +29,12 @@ Subject: [PATCH 06/14] Port to Maven 3.1.1 and Aether Ant Tasks
.../ProjectDependencyArtifactIdExtractorHack.java | 3 +-
.../maven/internal/ant/RepositoryBuilder.java | 24 ++++--
.../maven/internal/ant/RepositoryFactory.java | 21 +++--
- .../AbstractAntTaskBackedMavenPublisher.java | 58 ++++---------
+ .../AbstractAntTaskBackedMavenPublisher.java | 38 ++++-----
.../AntTaskBackedMavenLocalPublisher.java | 41 +++------
.../publisher/AntTaskBackedMavenPublisher.java | 47 ++++-------
.../publisher/MavenRemoteRepositoryFactory.java | 6 +-
.../publisher/ValidatingMavenPublisher.java | 6 +-
- 30 files changed, 363 insertions(+), 388 deletions(-)
+ 30 files changed, 363 insertions(+), 368 deletions(-)
delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomDeployTask.java
delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomInstallDeployTaskSupport.java
delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomInstallTask.java
@@ -43,10 +43,10 @@ Subject: [PATCH 06/14] Port to Maven 3.1.1 and Aether Ant Tasks
delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/LoggingHelper.java
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
-index 0c66ac1..3240df2 100755
+index 11a80eb..78e90fe 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
-@@ -74,8 +74,28 @@ libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:ht
+@@ -76,8 +76,28 @@ libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:ht
dependency "org.samba.jcifs:jcifs:1.3.17 at jar"
}
@@ -90,14 +90,13 @@ index 0c66ac1..3240df2 100755
//plexus:
dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
-@@ -114,27 +134,29 @@ libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
+@@ -114,27 +134,28 @@ libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
//core:
- dependency "org.apache.maven:maven-core:3.0.4 at jar"
- dependency "org.apache.maven:maven-model-builder:3.0.4 at jar"
- dependency "org.apache.maven:maven-model:3.0.4 at jar"
-+ dependency "org.apache.maven:maven-builder-support:3.1.1 at jar"
+ dependency "org.apache.maven:maven-core:3.1.1 at jar"
+ dependency "org.apache.maven:maven-model-builder:3.1.1 at jar"
+ dependency "org.apache.maven:maven-model:3.1.1 at jar"
@@ -197,10 +196,10 @@ index ddd4924..8dfde0d 100644
import java.io.File;
diff --git a/subprojects/dependency-management/dependency-management.gradle b/subprojects/dependency-management/dependency-management.gradle
-index ee4a931..548b7ef 100644
+index 3ddc4f3..2af3f84 100644
--- a/subprojects/dependency-management/dependency-management.gradle
+++ b/subprojects/dependency-management/dependency-management.gradle
-@@ -41,9 +41,10 @@ task jarJarMaven3(type: JarJar) {
+@@ -42,9 +42,10 @@ task jarJarMaven3(type: JarJar) {
//unfortunately, all those need to be jarjarred.
// Even if some library (like aether) is not included in maven-ant-tasks it has
// META-INF/plexus/components.xml that to jarjarred components.
@@ -1073,10 +1072,10 @@ index e3517aa..d4e1424 100644
}
}
diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AbstractAntTaskBackedMavenPublisher.java b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AbstractAntTaskBackedMavenPublisher.java
-index 6930e63..4bf3736 100644
+index 55c6324..4bf3736 100644
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AbstractAntTaskBackedMavenPublisher.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AbstractAntTaskBackedMavenPublisher.java
-@@ -16,28 +16,25 @@
+@@ -16,9 +16,10 @@
package org.gradle.api.publish.maven.internal.publisher;
@@ -1090,27 +1089,16 @@ index 6930e63..4bf3736 100644
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
import org.gradle.api.logging.LogLevel;
import org.gradle.api.publication.maven.internal.ant.EmptyMavenSettingsSupplier;
- import org.gradle.api.publication.maven.internal.ant.MavenSettingsSupplier;
--import org.gradle.api.publish.maven.InvalidMavenPublicationException;
- import org.gradle.api.publish.maven.MavenArtifact;
--import org.gradle.api.specs.Spec;
- import org.gradle.internal.Factory;
- import org.gradle.logging.LoggingManagerInternal;
- import org.gradle.util.AntUtil;
--import org.gradle.util.CollectionUtils;
- import org.gradle.util.GUtil;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
+@@ -33,7 +34,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
--import java.util.Set;
-abstract public class AbstractAntTaskBackedMavenPublisher<T extends InstallDeployTaskSupport> implements MavenPublisher {
+abstract public class AbstractAntTaskBackedMavenPublisher<T extends AbstractDistTask> implements MavenPublisher {
private final Factory<LoggingManagerInternal> loggingManagerFactory;
private static Logger logger = LoggerFactory.getLogger(AbstractAntTaskBackedMavenPublisher.class);
-@@ -50,11 +47,12 @@ abstract public class AbstractAntTaskBackedMavenPublisher<T extends InstallDeplo
+@@ -46,11 +47,12 @@ abstract public class AbstractAntTaskBackedMavenPublisher<T extends InstallDeplo
public void publish(MavenNormalizedPublication publication, MavenArtifactRepository artifactRepository) {
logger.info("Publishing to repository {}", artifactRepository);
@@ -1125,7 +1113,7 @@ index 6930e63..4bf3736 100644
postConfigure(deployTask, artifactRepository);
addPomAndArtifacts(deployTask, publication);
-@@ -67,43 +65,23 @@ abstract public class AbstractAntTaskBackedMavenPublisher<T extends InstallDeplo
+@@ -63,27 +65,23 @@ abstract public class AbstractAntTaskBackedMavenPublisher<T extends InstallDeplo
abstract protected T createDeployTask();
@@ -1137,7 +1125,7 @@ index 6930e63..4bf3736 100644
pom.setFile(publication.getPomFile());
- installOrDeployTask.addPom(pom);
-
-- MavenArtifact mainArtifact = determineMainArtifact(publication.getName(), publication.getArtifacts());
+- MavenArtifact mainArtifact = publication.getMainArtifact();
- installOrDeployTask.setFile(mainArtifact == null ? publication.getPomFile() : mainArtifact.getFile());
+ task.addPom(pom);
@@ -1149,20 +1137,6 @@ index 6930e63..4bf3736 100644
- attachedArtifact.setClassifier(GUtil.elvis(mavenArtifact.getClassifier(), ""));
- attachedArtifact.setType(GUtil.elvis(mavenArtifact.getExtension(), ""));
- attachedArtifact.setFile(mavenArtifact.getFile());
-- }
-- }
--
-- private MavenArtifact determineMainArtifact(String publicationName, Set<MavenArtifact> mavenArtifacts) {
-- Set<MavenArtifact> candidateMainArtifacts = CollectionUtils.filter(mavenArtifacts, new Spec<MavenArtifact>() {
-- public boolean isSatisfiedBy(MavenArtifact element) {
-- return element.getClassifier() == null || element.getClassifier().length() == 0;
-- }
-- });
-- if (candidateMainArtifacts.isEmpty()) {
-- return null;
-- }
-- if (candidateMainArtifacts.size() > 1) {
-- throw new InvalidMavenPublicationException(publicationName, "Cannot determine main artifact - multiple artifacts found with empty classifier.");
+ Artifact artifact = new Artifact();
+ artifact.setProject(task.getProject());
+ artifact.setClassifier(GUtil.elvis(mavenArtifact.getClassifier(), ""));
@@ -1170,10 +1144,8 @@ index 6930e63..4bf3736 100644
+ artifact.setFile(mavenArtifact.getFile());
+ task.addArtifact(artifact);
}
-- return candidateMainArtifacts.iterator().next();
}
--
- private void execute(InstallDeployTaskSupport deployTask) {
+ private void execute(AbstractDistTask deployTask) {
LoggingManagerInternal loggingManager = loggingManagerFactory.create();
diff --git a/0007-Remove-Class-Path-from-manifest.patch b/0007-Remove-Class-Path-from-manifest.patch
index 033122c..2db016a 100644
--- a/0007-Remove-Class-Path-from-manifest.patch
+++ b/0007-Remove-Class-Path-from-manifest.patch
@@ -1,4 +1,4 @@
-From 0cdd0ec9c47b800338cb0d8fdc33beee9a0aa13e Mon Sep 17 00:00:00 2001
+From b885097fd9a3d755c6a105da73e3e77184df2cb9 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 07/14] Remove Class-Path from manifest
@@ -34,10 +34,10 @@ index 9edcde8..9edbf6b 100644
/**
diff --git a/subprojects/launcher/launcher.gradle b/subprojects/launcher/launcher.gradle
-index 0fb144f..2f6ef0d 100644
+index 3e5acdc..3a3de3f 100644
--- a/subprojects/launcher/launcher.gradle
+++ b/subprojects/launcher/launcher.gradle
-@@ -25,13 +25,6 @@ integTestTasks.all {
+@@ -27,13 +27,6 @@ integTestTasks.all {
}
}
diff --git a/0008-Implement-XMvn-repository-factory-method.patch b/0008-Implement-XMvn-repository-factory-method.patch
index 989bcd1..1e02410 100644
--- a/0008-Implement-XMvn-repository-factory-method.patch
+++ b/0008-Implement-XMvn-repository-factory-method.patch
@@ -1,4 +1,4 @@
-From 3760a6767bc6c11259c036e5d9c28cd202edcf54 Mon Sep 17 00:00:00 2001
+From 8fb498a5b9b68e670f08bf2ac5d2a40120120fae 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 08/14] Implement XMvn repository factory method
@@ -58,7 +58,7 @@ index 7461f8f..207c63f 100644
}
diff --git a/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactory.java b/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactory.java
-index 1392f32..e37790c 100644
+index 9760340..4cdba71 100644
--- a/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactory.java
+++ b/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactory.java
@@ -17,6 +17,7 @@
@@ -69,7 +69,7 @@ index 1392f32..e37790c 100644
import org.gradle.api.artifacts.repositories.FlatDirectoryArtifactRepository;
import org.gradle.api.artifacts.repositories.IvyArtifactRepository;
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
-@@ -33,6 +34,12 @@ import org.gradle.internal.resource.local.FileStore;
+@@ -34,6 +35,12 @@ import org.gradle.internal.resource.local.FileStore;
import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
import java.io.File;
@@ -82,7 +82,7 @@ index 1392f32..e37790c 100644
public class DefaultBaseRepositoryFactory implements BaseRepositoryFactory {
private final LocalMavenRepositoryLocator localMavenRepositoryLocator;
-@@ -97,4 +104,41 @@ public class DefaultBaseRepositoryFactory implements BaseRepositoryFactory {
+@@ -100,4 +107,41 @@ public class DefaultBaseRepositoryFactory implements BaseRepositoryFactory {
private PasswordCredentials createPasswordCredentials() {
return instantiator.newInstance(DefaultPasswordCredentials.class);
}
diff --git a/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch b/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch
index f6197d2..a37a764 100644
--- a/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch
+++ b/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch
@@ -1,4 +1,4 @@
-From 23919f28b4999145d575c065f033a6fa526ea1d7 Mon Sep 17 00:00:00 2001
+From 94cf7b9b3bd68047da09d999c7677c49d01c1192 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu, 20 Nov 2014 11:04:23 +0100
Subject: [PATCH 09/14] Use hostname command as fallback way of getting build
diff --git a/0010-Compatibility-with-Guava-18.0.patch b/0010-Compatibility-with-Guava-18.0.patch
index 95f8cde..8ab99a4 100644
--- a/0010-Compatibility-with-Guava-18.0.patch
+++ b/0010-Compatibility-with-Guava-18.0.patch
@@ -1,4 +1,4 @@
-From a6e9e2c303fbaf8f3a6d3533ce685dbe0d5dee0c Mon Sep 17 00:00:00 2001
+From 8efafeacff2de5613f967cb0472f0112cec09826 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue, 20 Jan 2015 11:59:22 +0100
Subject: [PATCH 10/14] Compatibility with Guava 18.0
diff --git a/0011-Add-build-dependency-on-ASM-5.0.3.patch b/0011-Add-build-dependency-on-ASM-5.0.3.patch
index c1d477f..a670d28 100644
--- a/0011-Add-build-dependency-on-ASM-5.0.3.patch
+++ b/0011-Add-build-dependency-on-ASM-5.0.3.patch
@@ -1,4 +1,4 @@
-From 148595ce8c62248841f945d0084f939eaf131473 Mon Sep 17 00:00:00 2001
+From 01cb9e4aa5439b50f5fd3da01ca143a3b6a0b828 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 11/14] Add build dependency on ASM 5.0.3
@@ -10,7 +10,7 @@ added as dependency.
1 file changed, 1 insertion(+)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
-index 138b851..83a9006 100644
+index 0ee5bc6..bb15321 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -41,6 +41,7 @@ dependencies {
@@ -20,7 +20,7 @@ index 138b851..83a9006 100644
+ compile "org.ow2.asm:asm-all:5.0.3"
}
apply from: '../gradle/compile.gradle'
- apply from: '../gradle/codeQuality.gradle'
+ apply from: '../gradle/taskOrdering.gradle'
--
2.1.0
diff --git a/0012-Port-from-Simple-4-to-Jetty-9.patch b/0012-Port-from-Simple-4-to-Jetty-9.patch
index 8d44168..c3a62f5 100644
--- a/0012-Port-from-Simple-4-to-Jetty-9.patch
+++ b/0012-Port-from-Simple-4-to-Jetty-9.patch
@@ -1,4 +1,4 @@
-From cc319298430cfeabfefc95984196a92441c06483 Mon Sep 17 00:00:00 2001
+From 4377774a692e14d8b3bc8c6375c45e68d25fed23 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 12/14] Port from Simple 4 to Jetty 9
diff --git a/0013-Use-unversioned-dependency-JAR-names.patch b/0013-Use-unversioned-dependency-JAR-names.patch
index 7f35033..a8e03e5 100644
--- a/0013-Use-unversioned-dependency-JAR-names.patch
+++ b/0013-Use-unversioned-dependency-JAR-names.patch
@@ -1,4 +1,4 @@
-From 7658ef58aa3f249b891e5676116a8ac2e23ca3cb Mon Sep 17 00:00:00 2001
+From c1910e2dcbb3349f58b55670600415d5d033cb95 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 13/14] Use unversioned dependency JAR names
diff --git a/0014-Don-t-declare-dependency-on-jarjars.patch b/0014-Don-t-declare-dependency-on-jarjars.patch
index d26fb23..c99c716 100644
--- a/0014-Don-t-declare-dependency-on-jarjars.patch
+++ b/0014-Don-t-declare-dependency-on-jarjars.patch
@@ -1,4 +1,4 @@
-From 7063827838c75f5a450892266e7bd754ec8b98ef Mon Sep 17 00:00:00 2001
+From 72f8490fa4b1670aff5f1c68133b7f39dd81abed 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 14/14] Don't declare dependency on jarjars
@@ -8,12 +8,12 @@ Subject: [PATCH 14/14] Don't declare dependency on jarjars
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/subprojects/dependency-management/dependency-management.gradle b/subprojects/dependency-management/dependency-management.gradle
-index 548b7ef..c971dbe 100644
+index 2af3f84..ba55f67 100644
--- a/subprojects/dependency-management/dependency-management.gradle
+++ b/subprojects/dependency-management/dependency-management.gradle
-@@ -20,9 +20,7 @@ dependencies {
+@@ -19,9 +19,7 @@ dependencies {
runtime libraries.xbean //maven3 classes dependency
- runtime "org.bouncycastle:bcprov-jdk15:1.46 at jar"
+ runtime libraries.bouncycastle_provider
- compile fileTree("$buildDir/libs/jarjar") {
- builtBy 'jarJarMaven3'
@@ -22,7 +22,7 @@ index 548b7ef..c971dbe 100644
mvn3Input libraries.maven3
-@@ -34,27 +32,10 @@ dependencies {
+@@ -35,27 +33,10 @@ dependencies {
testFixturesCompile project(":internalIntegTesting")
}
diff --git a/gradle.spec b/gradle.spec
index b4efd2e..e26334d 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -12,8 +12,8 @@
%bcond_with bootstrap
Name: gradle
-Version: 2.2.1
-Release: 9%{?dist}
+Version: 2.3
+Release: 1%{?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.
@@ -421,7 +421,7 @@ rm -rf gradle/wrapper/
# Remove Zinc support as Zinc is not yet packaged for Fedora
rm -f $(find -name ZincScalaCompiler.java)
-sed -i /zinc/d subprojects/scala/scala.gradle
+sed -i /zinc/d subprojects/language-scala/language-scala.gradle
# This file is normally downloaded from Internet during package build
mkdir -p build
@@ -546,6 +546,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc LICENSE NOTICE
%changelog
+* Wed Mar 25 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3-1
+- Update to upstream version 2.3
+
* Wed Mar 25 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2.1-9
- Remove build dependency on cobertura
diff --git a/sources b/sources
index f9700e0..0bfc15f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6b2a86962413b392c5bed3c573dd961e gradle-2.2.1-src.zip
-62d2f466694d50d53b197e4e0e5ae8be all-released-versions.json
+9a568be0e77a1df5cbcf4b73887caf02 gradle-2.3-src.zip
+3374dc1278f9dba2188e95f7404a7ae7 all-released-versions.json
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gradle.git/commit/?h=master&id=ab8e6eec724d3d4e0b36387511286344a2f8ed08
--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
More information about the scm-commits
mailing list