Update to 2.3.7

This commit is contained in:
Jaromir Capik 2012-02-29 14:05:59 +01:00
parent a046e04f7e
commit e690400272
4 changed files with 7 additions and 20 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
maven-bundle-plugin-2.0.0-project.tar.gz
/maven-bundle-plugin-2.3.5-source-release.tar.gz
/maven-bundle-plugin-2.3.6-source-release.tar.gz
/maven-bundle-plugin-2.3.7-source-release.tar.gz

View File

@ -1,15 +0,0 @@
diff -Naur maven-bundle-plugin-2.3.6.orig/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java maven-bundle-plugin-2.3.6/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
--- maven-bundle-plugin-2.3.6.orig/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java 2011-11-28 18:19:31.000000000 +0100
+++ maven-bundle-plugin-2.3.6/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java 2012-01-19 18:25:28.684576614 +0100
@@ -575,4 +575,11 @@
{
return artifact.getDependencyConflictId() + ":" + artifact.getVersionRange();
}
+
+
+ public void manageArtifactSystemPath( Artifact artifact, Artifact replacement )
+ {
+ throw new UnsupportedOperationException();
+ }
+
}

View File

@ -1,8 +1,8 @@
%global site_name maven-bundle-plugin
Name: maven-plugin-bundle
Version: 2.3.6
Release: 3%{?dist}
Version: 2.3.7
Release: 1%{?dist}
Summary: Maven Bundle Plugin
Group: Development/Tools
@ -12,7 +12,6 @@ Source0: http://apache.tradebit.com/pub/felix/%{site_name}-%{version}-sou
#Patch0: %{site_name}-unbundling.patch
Patch1: %{site_name}-unreported-exception.patch
Patch2: %{site_name}-manageArtifactSystemPath.patch
BuildRequires: aqute-bndlib >= 1.50.0
BuildRequires: plexus-utils >= 1.4.5
@ -69,7 +68,6 @@ API documentation for %{name}.
#%%patch0 -p1
%patch1 -p1
%patch2 -p1
# remove bundled stuff
#rm -rf src/main/java/org/apache/maven
@ -105,6 +103,9 @@ rm -rf target/site/api*
%{_javadocdir}/%{name}
%changelog
* Wed Feb 29 2012 Jaromir Capik <jcapik@redhat.com> 2.3.7-1
- Update to 2.3.7
* Thu Jan 19 2012 Jaromir Capik <jcapik@redhat.com> 2.3.6-3
- Bundled maven sources readded (they seem to change the behaviour)

View File

@ -1 +1 @@
dfcff705fd35b5a96d95752134d9c493 maven-bundle-plugin-2.3.6-source-release.tar.gz
1e005fbc3ec00a9c94f6fb665c02d258 maven-bundle-plugin-2.3.7-source-release.tar.gz