Update to latest upstream.
This commit is contained in:
parent
a84355fe04
commit
83e4b639f4
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
maven-resources-plugin-2.2.tar.gz
|
maven-resources-plugin-2.2.tar.gz
|
||||||
/maven-resources-plugin-2.4.3.tar.gz
|
/maven-resources-plugin-2.4.3.tar.gz
|
||||||
/maven-resources-plugin-2.5.tar.gz
|
/maven-resources-plugin-2.5.tar.gz
|
||||||
|
/maven-resources-plugin-2.6-source-release.zip
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
diff --git a/pom.xml b/pom.xml
|
|
||||||
index f74aea0..5bb5ce2 100644
|
|
||||||
--- a/pom.xml
|
|
||||||
+++ b/pom.xml
|
|
||||||
@@ -65,6 +65,11 @@ under the License.
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
+ <groupId>org.codehaus.plexus</groupId>
|
|
||||||
+ <artifactId>plexus-container-default</artifactId>
|
|
||||||
+ <version>1.0-alpha-9-stable-1</version>
|
|
||||||
+ </dependency>
|
|
||||||
+ <dependency>
|
|
||||||
<groupId>org.apache.maven</groupId>
|
|
||||||
<artifactId>maven-plugin-api</artifactId>
|
|
||||||
<version>${mavenVersion}</version>
|
|
||||||
@@ -102,12 +107,6 @@ under the License.
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.codehaus.plexus</groupId>
|
|
||||||
- <artifactId>plexus-container-default</artifactId>
|
|
||||||
- <version>1.0-alpha-9-stable-1</version>
|
|
||||||
- </dependency>
|
|
||||||
-
|
|
||||||
- <dependency>
|
|
||||||
- <groupId>org.codehaus.plexus</groupId>
|
|
||||||
<artifactId>plexus-utils</artifactId>
|
|
||||||
<version>2.0.5</version>
|
|
||||||
</dependency>
|
|
@ -1,18 +1,12 @@
|
|||||||
Name: maven-resources-plugin
|
Name: maven-resources-plugin
|
||||||
Version: 2.5
|
Version: 2.6
|
||||||
Release: 6%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Maven Resources Plugin
|
Summary: Maven Resources Plugin
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://maven.apache.org/plugins/maven-resources-plugin
|
URL: http://maven.apache.org/plugins/maven-resources-plugin
|
||||||
#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.5 maven-resources-plugin-2.5
|
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||||
#tar zcf maven-resources-plugin-2.5.tar.gz maven-resources-plugin-2.5/
|
|
||||||
Source0: %{name}-%{version}.tar.gz
|
|
||||||
|
|
||||||
# Relocation of plexus-container-default is necessary as sisu gets to the
|
|
||||||
# classpath first and uses an old version of a class from container-default
|
|
||||||
Patch0: %{name}-plexus-dep.patch
|
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -65,7 +59,6 @@ API documentation for %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mvn-rpmbuild \
|
mvn-rpmbuild \
|
||||||
@ -97,6 +90,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
|
|||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 23 2012 Alexander Kurtakov <akurtako@redhat.com> 2.6-1
|
||||||
|
- Update to latest upstream.
|
||||||
|
|
||||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5-6
|
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user