[javapackages-tools] Add support for installing Maven artifacts with .hpi extension

[Michal Srb]

commit 416c5289ba553be6ffe1cd3e87199a3e438c4d6d
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Feb 10 16:26:43 2014 +0100

    Add support for installing Maven artifacts with .hpi extension

 0001-Add-support-for-installing-hpi.patch |   85 +++++++++++++++++++++++++++++
 javapackages-tools.spec                   |   10 +++-
 2 files changed, 94 insertions(+), 1 deletions(-)
---
diff --git a/0001-Add-support-for-installing-hpi.patch b/0001-Add-support-for-installing-hpi.patch
new file mode 100644
index 0000000..e5526a2
--- /dev/null
+++ b/0001-Add-support-for-installing-hpi.patch
@@ -0,0 +1,85 @@
+diff --git a/configs/configuration-20-rpmbuild-raw.xml b/configs/configuration-20-rpmbuild-raw.xml
+index eb99908..9ab7b30 100644
+--- a/configs/configuration-20-rpmbuild-raw.xml
++++ b/configs/configuration-20-rpmbuild-raw.xml
+@@ -37,6 +37,18 @@
+       </stereotypes>
+     </repository>
+     <repository>
++      <id>jenkins-plugin</id>
++      <type>jpp</type>
++      <properties>
++        <root>usr/share/jenkins/plugins</root>
++      </properties>
++      <stereotypes>
++        <stereotype>
++          <extension>hpi</extension>
++        <stereotype>
++      </stereotypes>
++    </repository>
++    <repository>
+       <id>base-jni</id>
+       <type>jpp</type>
+       <properties>
+diff --git a/configs/configuration-20-rpmbuild.xml b/configs/configuration-20-rpmbuild.xml
+index 5ecb4ba..7a7b543 100644
+--- a/configs/configuration-20-rpmbuild.xml
++++ b/configs/configuration-20-rpmbuild.xml
+@@ -49,6 +49,18 @@
+       </stereotypes>
+     </repository>
+     <repository>
++      <id>jenkins-plugin</id>
++      <type>jpp</type>
++      <properties>
++        <root>usr/share/jenkins/plugins</root>
++      </properties>
++      <stereotypes>
++        <stereotype>
++          <extension>hpi</extension>
++        </stereotype>
++      </stereotypes>
++    </repository>
++    <repository>
+       <id>base-jni</id>
+       <type>jpp</type>
+       <properties>
+diff --git a/configs/configuration-20.xml b/configs/configuration-20.xml
+index 1186b46..fa6798d 100644
+--- a/configs/configuration-20.xml
++++ b/configs/configuration-20.xml
+@@ -86,6 +86,18 @@
+       </stereotypes>
+     </repository>
+     <repository>
++      <id>jenkins-plugin</id>
++      <type>jpp</type>
++      <properties>
++        <root>usr/share/jenkins/plugins</root>
++      </properties>
++      <stereotypes>
++        <stereotype>
++          <extension>hpi</extension>
++        </stereotype>
++      </stereotypes>
++    </repository>
++    <repository>
+       <id>base-jni</id>
+       <type>jpp</type>
+       <properties>
+@@ -107,6 +119,7 @@
+           <repository>base-raw-pom</repository>
+           <repository>base-jar</repository>
+           <repository>base-jni</repository>
++          <repository>jenkins-plugin</repository>
+         </repositories>
+       </configuration>
+     </repository>
+@@ -118,6 +131,7 @@
+           <repository>base-raw-pom</repository>
+           <repository>base-jni</repository>
+           <repository>base-jar</repository>
++          <repository>jenkins-plugin</repository>
+         </repositories>
+       </configuration>
+     </repository>
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index d77eca7..fcc3bbb 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
 Name:           javapackages-tools
 Version:        3.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
@@ -8,6 +8,9 @@ License:        BSD
 URL:            https://fedorahosted.org/javapackages/
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
 
+# Add support for installing Maven artifacts with .hpi extension
+Patch0:         0001-Add-support-for-installing-hpi.patch
+
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils
@@ -108,6 +111,8 @@ Requires:       fedora-review
 %prep
 %setup -q -n javapackages-%{version}
 
+%patch0 -p1
+
 %build
 %configure
 ./build
@@ -144,6 +149,9 @@ popd
 
 
 %changelog
+* Mon Feb 10 2014 Michal Srb <msrb at redhat.com> - 3.5.0-4
+- Add support for installing Maven artifacts with .hpi extension
+
 * Fri Jan 17 2014 Michael Simacek <msimacek at redhat.com> - 3.5.0-3
 - Use upstream method of running tests (nosetests)