commit 792b90e2fe0f83d7cbd92db17ea7aa260822b59d
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Oct 3 08:46:31 2014 +0200
Install as Jenkins plugin
jenkins-ssh-credentials-plugin.spec | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/jenkins-ssh-credentials-plugin.spec b/jenkins-ssh-credentials-plugin.spec
index bcd8863..66ff19e 100644
--- a/jenkins-ssh-credentials-plugin.spec
+++ b/jenkins-ssh-credentials-plugin.spec
@@ -1,9 +1,10 @@
%global mod_name ssh-credentials-plugin
%global short_name ssh-credentials
+%global plugin_home %{_datadir}/jenkins/plugins/%{short_name}
Name: jenkins-ssh-credentials-plugin
Version: 1.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Jenkins SSH Credentials Plugin
License: MIT
@@ -21,6 +22,8 @@ BuildRequires: mvn(org.jenkins-ci.plugins:plugin:pom:)
BuildRequires: mvn(org.jenkins-ci.tools:maven-hpi-plugin)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-jdk14)
+BuildRequires: mvn(org.kohsuke:access-modifier-checker)
+BuildRequires: mvn(org.jenkins-ci.main:jenkins-core)
BuildArch: noarch
@@ -36,24 +39,36 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{mod_name}-%{short_name}-%{version}
-# do not build HPI yet, JAR is enough for now
%mvn_package ::hpi: __noinstall
%pom_add_dep net.jcip:jcip-annotations
+%mvn_file ::jar:: %{name}/%{short_name} %{plugin_home}/WEB-INF/lib/%{short_name}
%build
# missing dep org.codehaus.mojo:findbugs-maven-plugin
%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/%{short_name}.jar
+xmvn-subst %{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
+* Fri Oct 03 2014 Michal Srb <msrb(a)redhat.com> - 1.6.1-3
+- Install as Jenkins plugin
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.6.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild