[gradle] Private methods should be get using Class.getDeclaredMethod()
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Feb 3 08:08:37 UTC 2015
commit a6ca70c8f7abfc17e0da3ce78037c8794f440cb6
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Feb 3 09:04:51 2015 +0100
Private methods should be get using Class.getDeclaredMethod()
...-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch | 17 ++++++++---------
0007-Remove-Class-Path-from-manifest.patch | 2 +-
...-Implement-XMvn-repository-factory-method.patch | 2 +-
...e-command-as-fallback-way-of-getting-buil.patch | 2 +-
0010-Compatibility-with-Guava-18.0.patch | 2 +-
0011-Add-build-dependency-on-ASM-5.0.3.patch | 2 +-
0012-Port-from-Simple-4-to-Jetty-9.patch | 2 +-
7 files changed, 14 insertions(+), 15 deletions(-)
---
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 b513429..6c61f1a 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 01f241aae6189e25a6ecc9adec9653c12beade40 Mon Sep 17 00:00:00 2001
+From 5afd16dc00e401d6f5aa4e6d97960ba5621d84de 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/12] Port to Maven 3.1.1 and Aether Ant Tasks
@@ -14,7 +14,7 @@ Subject: [PATCH 06/12] Port to Maven 3.1.1 and Aether Ant Tasks
.../mvnsettings/DefaultMavenSettingsProvider.java | 4 +-
.../mvnsettings/MavenSettingsProvider.java | 4 +-
.../maven/internal/DefaultMavenPom.java | 6 +-
- .../maven/internal/ant/AbstractMavenResolver.java | 72 ++++++++++------
+ .../maven/internal/ant/AbstractMavenResolver.java | 71 ++++++++++------
.../maven/internal/ant/BaseMavenDeployer.java | 98 ++++++++++++++++------
.../maven/internal/ant/BaseMavenInstaller.java | 12 +--
.../maven/internal/ant/CustomDeployTask.java | 45 ----------
@@ -34,7 +34,7 @@ Subject: [PATCH 06/12] Port to Maven 3.1.1 and Aether Ant Tasks
.../publisher/AntTaskBackedMavenPublisher.java | 47 ++++-------
.../publisher/MavenRemoteRepositoryFactory.java | 6 +-
.../publisher/ValidatingMavenPublisher.java | 6 +-
- 30 files changed, 364 insertions(+), 388 deletions(-)
+ 30 files changed, 363 insertions(+), 388 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
@@ -296,7 +296,7 @@ index 482c0a9..80b1ad9 100644
effectivePom.withXmlActions = withXmlActions;
whenConfiguredActions.execute(effectivePom);
diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/AbstractMavenResolver.java b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/AbstractMavenResolver.java
-index 854202f..7a9e154 100644
+index 854202f..6d35082 100644
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/AbstractMavenResolver.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/AbstractMavenResolver.java
@@ -16,12 +16,13 @@
@@ -334,7 +334,7 @@ index 854202f..7a9e154 100644
public void publish(IvyModulePublishMetaData moduleVersion) {
for (IvyModuleArtifactPublishMetaData artifact : moduleVersion.getArtifacts()) {
-@@ -80,32 +82,40 @@ public abstract class AbstractMavenResolver extends AbstractArtifactRepository i
+@@ -80,32 +82,39 @@ public abstract class AbstractMavenResolver extends AbstractArtifactRepository i
publish();
}
@@ -370,10 +370,9 @@ index 854202f..7a9e154 100644
- settings = ((CustomInstallDeployTaskSupport) installDeployTaskSupport).getSettings();
+
+ try {
-+ AntRepoSys repoSys = AntRepoSys.getInstance(project);
-+ Method getter = repoSys.getClass().getMethod("getSettings");
++ Method getter = AntRepoSys.class.getDeclaredMethod("getSettings");
+ getter.setAccessible(true);
-+ settings = (Settings) getter.invoke(repoSys);
++ settings = (Settings) getter.invoke(AntRepoSys.getInstance(project));
+ } catch (ReflectiveOperationException e) {
+ throw new RuntimeException(e);
+ }
@@ -384,7 +383,7 @@ index 854202f..7a9e154 100644
loggingManager.captureStandardOutput(LogLevel.INFO).start();
try {
deployTask.execute();
-@@ -114,19 +124,33 @@ public abstract class AbstractMavenResolver extends AbstractArtifactRepository i
+@@ -114,19 +123,33 @@ public abstract class AbstractMavenResolver extends AbstractArtifactRepository i
}
}
diff --git a/0007-Remove-Class-Path-from-manifest.patch b/0007-Remove-Class-Path-from-manifest.patch
index 6290ec6..3f56557 100644
--- a/0007-Remove-Class-Path-from-manifest.patch
+++ b/0007-Remove-Class-Path-from-manifest.patch
@@ -1,4 +1,4 @@
-From 89457f3286a91f9b8269126913cabee95340d667 Mon Sep 17 00:00:00 2001
+From 0cdd0ec9c47b800338cb0d8fdc33beee9a0aa13e 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/12] Remove Class-Path from manifest
diff --git a/0008-Implement-XMvn-repository-factory-method.patch b/0008-Implement-XMvn-repository-factory-method.patch
index e1827dc..ae86f59 100644
--- a/0008-Implement-XMvn-repository-factory-method.patch
+++ b/0008-Implement-XMvn-repository-factory-method.patch
@@ -1,4 +1,4 @@
-From 394a778339c85edf3c836a97472ff5fe5efe29f8 Mon Sep 17 00:00:00 2001
+From 3760a6767bc6c11259c036e5d9c28cd202edcf54 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/12] Implement XMvn repository factory method
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 c151f39..c88a465 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 958bab2f736b41ae209695e64409b7de36e298f4 Mon Sep 17 00:00:00 2001
+From 23919f28b4999145d575c065f033a6fa526ea1d7 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/12] 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 cc6be33..297755e 100644
--- a/0010-Compatibility-with-Guava-18.0.patch
+++ b/0010-Compatibility-with-Guava-18.0.patch
@@ -1,4 +1,4 @@
-From 40d50fdf4ad6f7dce21b783f2488b3fbbe593aee Mon Sep 17 00:00:00 2001
+From a6e9e2c303fbaf8f3a6d3533ce685dbe0d5dee0c 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/12] 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 2bd003b..063686a 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 05af7e68c30fb884e26b60727a5107828ceb2a6e Mon Sep 17 00:00:00 2001
+From 148595ce8c62248841f945d0084f939eaf131473 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/12] Add build dependency on ASM 5.0.3
diff --git a/0012-Port-from-Simple-4-to-Jetty-9.patch b/0012-Port-from-Simple-4-to-Jetty-9.patch
index 2d78bd6..a0ab2fc 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 c02cd8fb3a9875241f29d7e3507edee7c2d94851 Mon Sep 17 00:00:00 2001
+From 713fec8214f017e388dffda0b429349eba9f43e0 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/12] Port from Simple 4 to Jetty 9
More information about the scm-commits
mailing list