OBR plugin readded (it's been merged to the bundle plugin)
This commit is contained in:
parent
b482e02a04
commit
f6ba1c6fc6
13
maven-bundle-plugin-unreported-exception.patch
Normal file
13
maven-bundle-plugin-unreported-exception.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff -Naur maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java
|
||||||
|
--- maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java 2011-07-05 13:56:05.000000000 +0200
|
||||||
|
+++ maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java 2011-11-14 18:21:26.878801248 +0100
|
||||||
|
@@ -125,6 +125,9 @@
|
||||||
|
{
|
||||||
|
throw new MojoExecutionException( "Unable to configure Wagon: '" + repository.getProtocol() + "'", e );
|
||||||
|
}
|
||||||
|
+ catch ( Exception e )
|
||||||
|
+ {
|
||||||
|
+ }
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: maven-plugin-bundle
|
Name: maven-plugin-bundle
|
||||||
Version: 2.3.5
|
Version: 2.3.5
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Maven Bundle Plugin
|
Summary: Maven Bundle Plugin
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
@ -12,6 +12,7 @@ Source0: http://apache.tradebit.com/pub/felix/%{site_name}-%{version}-sou
|
|||||||
|
|
||||||
Patch0: %{site_name}-unbundling.patch
|
Patch0: %{site_name}-unbundling.patch
|
||||||
Patch1: %{site_name}-exception-already-thrown.patch
|
Patch1: %{site_name}-exception-already-thrown.patch
|
||||||
|
Patch2: %{site_name}-unreported-exception.patch
|
||||||
|
|
||||||
BuildRequires: aqute-bndlib >= 1.43.0
|
BuildRequires: aqute-bndlib >= 1.43.0
|
||||||
BuildRequires: plexus-utils >= 1.4.5
|
BuildRequires: plexus-utils >= 1.4.5
|
||||||
@ -68,10 +69,10 @@ API documentation for %{name}.
|
|||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
# remove bundled stuff
|
# remove bundled stuff
|
||||||
rm -rf src/main/java/org/apache/maven
|
rm -rf src/main/java/org/apache/maven
|
||||||
rm -rf src/main/java/org/apache/felix/obrplugin
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# tests can't be built (seems like a MavenProjectStub incompatibility with MavenProject)
|
# tests can't be built (seems like a MavenProjectStub incompatibility with MavenProject)
|
||||||
@ -102,6 +103,9 @@ rm -rf target/site/api*
|
|||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 14 2011 Jaromir Capik <jcapik@redhat.com> 2.3.5-2
|
||||||
|
- OBR plugin readded (it's been merged to the bundle plugin)
|
||||||
|
|
||||||
* Mon Oct 24 2011 Jaromir Capik <jcapik@redhat.com> 2.3.5-1
|
* Mon Oct 24 2011 Jaromir Capik <jcapik@redhat.com> 2.3.5-1
|
||||||
- Update to 2.3.5
|
- Update to 2.3.5
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user