Update to upstream version 2.6
- Build with xmvn - Install license files
This commit is contained in:
Mikolaj Izdebski
parent
992515196a
commit
965c772060
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ maven-dependency-plugin-2.2.tar.xz
|
||||
/maven-dependency-plugin-2.2-source-release.zip
|
||||
/maven-dependency-plugin-2.3-source-release.zip
|
||||
/maven-dependency-plugin-2.4-source-release.zip
|
||||
/maven-dependency-plugin-2.6-source-release.zip
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java b/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
|
||||
index 182cd28..a7078a1 100644
|
||||
--- a/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
|
||||
+++ b/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
|
||||
@@ -24,7 +24,6 @@ import java.io.File;
|
||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
|
||||
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
|
||||
-import org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout;
|
||||
import org.apache.maven.plugin.MojoFailureException;
|
||||
import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
|
||||
|
||||
@@ -101,11 +100,6 @@ public class TestGetMojo
|
||||
assertEquals( DefaultRepositoryLayout.class, repo.getLayout().getClass() );
|
||||
assertEquals( "http://repo1.maven.apache.org/maven2", repo.getUrl() );
|
||||
|
||||
- repo = mojo.parseRepository( "central::legacy::http://repo1.maven.apache.org/maven2", policy );
|
||||
- assertEquals( "central", repo.getId() );
|
||||
- assertEquals( LegacyRepositoryLayout.class, repo.getLayout().getClass() );
|
||||
- assertEquals( "http://repo1.maven.apache.org/maven2", repo.getUrl() );
|
||||
-
|
||||
repo = mojo.parseRepository( "central::::http://repo1.maven.apache.org/maven2", policy );
|
||||
assertEquals( "central", repo.getId() );
|
||||
assertEquals( DefaultRepositoryLayout.class, repo.getLayout().getClass() );
|
||||
@ -1,6 +1,6 @@
|
||||
Name: maven-dependency-plugin
|
||||
Version: 2.5.1
|
||||
Release: 2%{?dist}
|
||||
Version: 2.6
|
||||
Release: 1%{?dist}
|
||||
Summary: Plugin to manipulate, copy and unpack local and remote artifacts
|
||||
|
||||
Group: Development/Libraries
|
||||
@ -12,8 +12,6 @@ Patch0: 0001-Add-setThreshold-stub.patch
|
||||
Patch1: %{name}-commons-io.patch
|
||||
# Added maven-core dep
|
||||
Patch2: %{name}-core.patch
|
||||
# Removed a test because it was using a legacy class
|
||||
Patch3: %{name}-removed-test.patch
|
||||
# Removed exception catching as it has already been done
|
||||
# (not upstreamable)
|
||||
Patch4: %{name}-removed-exception-catching.patch
|
||||
@ -24,7 +22,7 @@ BuildRequires: java-devel >= 1:1.6.0
|
||||
BuildRequires: plexus-utils
|
||||
BuildRequires: ant
|
||||
BuildRequires: apache-commons-io
|
||||
BuildRequires: maven
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: maven-install-plugin
|
||||
BuildRequires: maven-compiler-plugin
|
||||
BuildRequires: maven-dependency-tree
|
||||
@ -42,16 +40,6 @@ BuildRequires: maven-project
|
||||
BuildRequires: maven-artifact-manager
|
||||
BuildRequires: maven-plugin-testing-tools
|
||||
|
||||
Requires: maven
|
||||
Requires: jpackage-utils
|
||||
Requires: java
|
||||
Requires: maven-dependency-tree
|
||||
Requires: maven-shared-common-artifact-filters
|
||||
Requires: maven-shared-dependency-analyzer
|
||||
Requires: maven-shared-file-management
|
||||
Requires: maven-project
|
||||
Requires: maven-artifact-manager
|
||||
|
||||
Obsoletes: maven2-plugin-dependency <= 0:2.0.8
|
||||
Provides: maven2-plugin-dependency = 1:%{version}-%{release}
|
||||
|
||||
@ -64,7 +52,6 @@ repositories to a specified location.
|
||||
%package javadoc
|
||||
Group: Documentation
|
||||
Summary: API documentation for %{name}
|
||||
Requires: jpackage-utils
|
||||
|
||||
%description javadoc
|
||||
%{summary}.
|
||||
@ -76,7 +63,6 @@ Requires: jpackage-utils
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
sed -i \
|
||||
@ -85,31 +71,25 @@ sed -i \
|
||||
|
||||
|
||||
%build
|
||||
mvn-rpmbuild -Dmaven.test.failure.ignore=true \
|
||||
install javadoc:javadoc
|
||||
# Tests fail to compile because they use unsupported legacy API.
|
||||
%mvn_build -f
|
||||
|
||||
%install
|
||||
# jars
|
||||
install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
%mvn_install
|
||||
|
||||
# poms
|
||||
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%files -f .mfiles
|
||||
%dir %{_javadir}/%{name}
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%add_maven_depmap JPP-%{name}.pom %{name}.jar
|
||||
|
||||
# javadoc
|
||||
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
|
||||
%files
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%{_mavendepmapfragdir}/%{name}
|
||||
|
||||
%files javadoc
|
||||
%{_javadocdir}/%{name}
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Wed Jan 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-1
|
||||
- Update to upstream version 2.6
|
||||
- Build with xmvn
|
||||
- Install license files
|
||||
|
||||
* Tue Jan 22 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5.1-2
|
||||
- Remove unneeded BR: asm2
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user