[jenkins-ant-plugin] Build with jenkins-remoting 2.48
Michal Srb
msrb at fedoraproject.org
Tue Nov 18 13:54:18 UTC 2014
commit a105cc4827c5c8501c154f098e716d2ba32da822
Author: Michal Srb <msrb at redhat.com>
Date: Tue Nov 18 14:50:53 2014 +0100
Build with jenkins-remoting 2.48
build-with-remoting-2.48.patch | 23 +++++++++++++++++++++++
jenkins-ant-plugin.spec | 5 +++++
2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/build-with-remoting-2.48.patch b/build-with-remoting-2.48.patch
new file mode 100644
index 0000000..df599a9
--- /dev/null
+++ b/build-with-remoting-2.48.patch
@@ -0,0 +1,23 @@
+diff --git a/src/main/java/hudson/tasks/Ant.java b/src/main/java/hudson/tasks/Ant.java
+index 035cec4..21c14e3 100644
+--- a/src/main/java/hudson/tasks/Ant.java
++++ b/src/main/java/hudson/tasks/Ant.java
+@@ -52,6 +52,8 @@ import hudson.util.VariableResolver;
+ import hudson.util.FormValidation;
+ import hudson.util.XStream2;
+ import net.sf.json.JSONObject;
++
++import org.jenkinsci.remoting.RoleChecker;
+ import org.kohsuke.stapler.DataBoundConstructor;
+ import org.kohsuke.stapler.StaplerRequest;
+ import org.kohsuke.stapler.QueryParameter;
+@@ -348,6 +350,9 @@ public class Ant extends Builder {
+ return exe.getPath();
+ return null;
+ }
++
++ public void checkRoles(RoleChecker arg0) throws SecurityException {
++ }
+ });
+ }
+
diff --git a/jenkins-ant-plugin.spec b/jenkins-ant-plugin.spec
index 2712bc9..f91d004 100644
--- a/jenkins-ant-plugin.spec
+++ b/jenkins-ant-plugin.spec
@@ -14,6 +14,8 @@ Source0: https://github.com/jenkinsci/%{mod_name}/archive/%{short_name}-%
# Text copied from http://www.opensource.org/licenses/mit-license.php
Source1: LICENSE.txt
+Patch0: build-with-remoting-2.48.patch
+
BuildRequires: maven-local
BuildRequires: mvn(org.jenkins-ci.plugins:plugin:pom:)
BuildRequires: mvn(org.kohsuke:access-modifier-checker)
@@ -34,6 +36,8 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{mod_name}-%{short_name}-%{version}
+%patch0 -p1
+
cp %{SOURCE1} .
%mvn_package ::hpi: __noinstall
%mvn_file ::jar:: %{name}/%{short_name} %{plugin_home}/WEB-INF/lib/%{short_name}
@@ -63,6 +67,7 @@ sed -i 's|%{plugin_home}/WEB-INF/lib/%{short_name}.jar||' .mfiles
%changelog
* Tue Nov 18 2014 Michal Srb <msrb at redhat.com> - 1.2-3
- Rebuild to fix plugin dependencies
+- Fix FTBFS
* Mon Oct 13 2014 Michal Srb <msrb at redhat.com> - 1.2-2
- This is a core plugin, move it to the correct location
More information about the scm-commits
mailing list