commit 68f504131333ef8ef5e252e617c91d1b94aaaa98 Author: Michal Srb msrb@redhat.com Date: Thu Sep 25 21:18:36 2014 +0200
Initial packaging
.gitignore | 2 + 0001-Remove-animal-sniffer-annotations.patch | 32 +++++++++++ jenkins-external-monitor-job-plugin.spec | 72 ++++++++++++++++++++++++++ sources | 2 + 4 files changed, 108 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..d809a29 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/external-monitor-job-1.2.tar.gz +/LICENSE.txt diff --git a/0001-Remove-animal-sniffer-annotations.patch b/0001-Remove-animal-sniffer-annotations.patch new file mode 100644 index 0000000..29431e5 --- /dev/null +++ b/0001-Remove-animal-sniffer-annotations.patch @@ -0,0 +1,32 @@ +From 2a5efa9bd24952e9d058876461c146e414d7f94c Mon Sep 17 00:00:00 2001 +From: Michal Srb msrb@redhat.com +Date: Wed, 24 Sep 2014 13:12:47 +0200 +Subject: [PATCH] Remove animal sniffer annotations + +--- + src/main/java/hudson/model/ExternalRun.java | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/main/java/hudson/model/ExternalRun.java b/src/main/java/hudson/model/ExternalRun.java +index e052c8c..c860ce1 100644 +--- a/src/main/java/hudson/model/ExternalRun.java ++++ b/src/main/java/hudson/model/ExternalRun.java +@@ -26,7 +26,6 @@ package hudson.model; + import hudson.Proc; + import hudson.util.DecodingStream; + import hudson.util.DualOutputStream; +-import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement; + + import javax.xml.stream.XMLInputFactory; + import javax.xml.stream.XMLStreamException; +@@ -100,7 +99,6 @@ public class ExternalRun extends Run<ExternalJob,ExternalRun> { + * </xmp></pre> + */ + @SuppressWarnings({"Since15"}) +- @IgnoreJRERequirement + public void acceptRemoteSubmission(final Reader in) throws IOException { + final long[] duration = new long[1]; + execute(new RunExecution() { +-- +1.9.3 + diff --git a/jenkins-external-monitor-job-plugin.spec b/jenkins-external-monitor-job-plugin.spec new file mode 100644 index 0000000..d478520 --- /dev/null +++ b/jenkins-external-monitor-job-plugin.spec @@ -0,0 +1,72 @@ +%global mod_name external-monitor-job-plugin +%global short_name external-monitor-job +%global plugin_home %{_datadir}/jenkins/plugins/%{short_name} + +Name: jenkins-%{mod_name} +Version: 1.2 +Release: 1%{?dist} +Summary: Jenkins External Monitor Job Plugin + +# License is specified in pom.xml +License: MIT +URL: https://github.com/jenkinsci/external-monitor-job-plugin +Source0: https://github.com/jenkinsci/%%7Bmod_name%7D/archive/%%7Bshort_name%7D-%%7Bv... +# Text copied from http://www.opensource.org/licenses/mit-license.php +Source1: LICENSE.txt + +Patch0: 0001-Remove-animal-sniffer-annotations.patch + +BuildRequires: maven-local +BuildRequires: mvn(org.jenkins-ci.plugins:plugin:pom:) +BuildRequires: mvn(org.kohsuke:access-modifier-checker) +BuildRequires: mvn(org.jenkins-ci.main:jenkins-core) + +BuildArch: noarch + +%description +This package provides Jenkins plugin which adds the ability to monitor +the result of externally executed jobs. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +This package contains the API documentation +for %{name}. + +%prep +%setup -q -n %{mod_name}-%{short_name}-%{version} + +%patch0 -p1 + +%pom_remove_plugin :animal-sniffer-maven-plugin + +cp %{SOURCE1} . +%mvn_package ::hpi: __noinstall +%mvn_file ::jar:: %{name}/%{short_name} %{plugin_home}/WEB-INF/lib/%{short_name} + +%build +# tests are disabled, because: "package org.jvnet.hudson.test does not exist" +# we don't have these Jenkins test artifacts in Fedora +%mvn_build -f + +%install +# unpack hpi file into the correct location +install -d -m 755 %{buildroot}/%{plugin_home} +unzip -d %{buildroot}/%{plugin_home} target/%{short_name}.hpi +rm %{buildroot}/%{plugin_home}/WEB-INF/lib/* + +%mvn_install +sed -i 's|%{plugin_home}/WEB-INF/lib/%{short_name}.jar||' .mfiles + +%files -f .mfiles +%dir %{_javadir}/%{name} +%dir %{_mavenpomdir}/%{name} +%{plugin_home} +%doc LICENSE.txt +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt + +%changelog +* Wed Sep 24 2014 Michal Srb msrb@redhat.com - 1.2-1 +- Initial packaging diff --git a/sources b/sources index e69de29..8e102f8 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +28feac8c5319b0c302c433ebfadb1f99 external-monitor-job-1.2.tar.gz +b28808853537299bae3b2025e2c38d89 LICENSE.txt