Add support for installing Maven artifacts with .hpi extension

This commit is contained in:
Michal Srb 2014-02-10 16:26:43 +01:00
parent 7fe1488be1
commit 416c5289ba
2 changed files with 94 additions and 1 deletions

View File

@ -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>

View File

@ -1,6 +1,6 @@
Name: javapackages-tools Name: javapackages-tools
Version: 3.5.0 Version: 3.5.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: Macros and scripts for Java packaging support Summary: Macros and scripts for Java packaging support
@ -8,6 +8,9 @@ License: BSD
URL: https://fedorahosted.org/javapackages/ URL: https://fedorahosted.org/javapackages/
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz 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 BuildArch: noarch
BuildRequires: jpackage-utils BuildRequires: jpackage-utils
@ -108,6 +111,8 @@ Requires: fedora-review
%prep %prep
%setup -q -n javapackages-%{version} %setup -q -n javapackages-%{version}
%patch0 -p1
%build %build
%configure %configure
./build ./build
@ -144,6 +149,9 @@ popd
%changelog %changelog
* Mon Feb 10 2014 Michal Srb <msrb@redhat.com> - 3.5.0-4
- Add support for installing Maven artifacts with .hpi extension
* Fri Jan 17 2014 Michael Simacek <msimacek@redhat.com> - 3.5.0-3 * Fri Jan 17 2014 Michael Simacek <msimacek@redhat.com> - 3.5.0-3
- Use upstream method of running tests (nosetests) - Use upstream method of running tests (nosetests)