update to 2.0-alpha1
This commit is contained in:
Jaromir Capik
parent
2c7ce2dc9c
commit
0fc124fbfa
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
maven-plugin-testing-1.2.tar.xz
|
||||
/maven-plugin-testing-2.0-alpha-1.tar.xz
|
||||
|
||||
25
maven-plugin-testing-maven3-missing-methods.patch
Normal file
25
maven-plugin-testing-maven3-missing-methods.patch
Normal file
@ -0,0 +1,25 @@
|
||||
diff -Naur maven-plugin-testing-2.0-alpha-1.orig/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java maven-plugin-testing-2.0-alpha-1/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java
|
||||
--- maven-plugin-testing-2.0-alpha-1.orig/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java 2009-09-19 14:55:30.000000000 +0200
|
||||
+++ maven-plugin-testing-2.0-alpha-1/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java 2011-11-09 19:21:57.940268463 +0100
|
||||
@@ -212,6 +212,21 @@
|
||||
|
||||
}
|
||||
|
||||
+ public boolean isProjectAware()
|
||||
+ {
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ public List<ArtifactRepository> getMirroredRepositories()
|
||||
+ {
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ public void setMirroredRepositories( List<ArtifactRepository> mirroredRepositories )
|
||||
+ {
|
||||
+
|
||||
+ }
|
||||
+
|
||||
public void setReleaseUpdatePolicy( ArtifactRepositoryPolicy policy )
|
||||
{
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
%global ver_suffix -alpha-1
|
||||
|
||||
Name: maven-plugin-testing
|
||||
Version: 1.2
|
||||
Release: 9%{?dist}
|
||||
Version: 2.0
|
||||
Release: 1.alpha1%{?dist}
|
||||
Summary: Maven Plugin Testing
|
||||
|
||||
Group: Development/Libraries
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/plugin-testing/
|
||||
#svn export http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-1.2 maven-plugin-testing-1.2
|
||||
#tar caf maven-plugin-testing-1.2 maven-plugin-testing-1.2/
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
|
||||
# patch for building with plexus-containers 1.5.4
|
||||
Patch1: maven-plugin-testing-harness-SilentLog.patch
|
||||
Patch2: maven-plugin-testing-harness-ArtifactStub.patch
|
||||
Patch3: maven-plugin-testing-harness-AbstractMojoTestCase.patch
|
||||
#svn export http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.0-alpha-1
|
||||
#tar caf maven-plugin-testing-2.0-alpha-1.tar.xz maven-plugin-testing-2.0-alpha-1
|
||||
Source0: %{name}-%{version}%{ver_suffix}.tar.xz
|
||||
|
||||
Patch0: %{name}-maven3-missing-methods.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: junit
|
||||
BuildRequires: java-devel >= 1:1.6.0
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: maven
|
||||
BuildRequires: maven-install-plugin
|
||||
BuildRequires: maven-compiler-plugin
|
||||
@ -35,10 +35,8 @@ BuildRequires: maven-shared-reporting-impl
|
||||
BuildRequires: maven-test-tools
|
||||
|
||||
Requires: maven
|
||||
Requires: jpackage-utils
|
||||
Requires: java
|
||||
Requires(post): jpackage-utils
|
||||
Requires(postun): jpackage-utils
|
||||
Requires: jpackage-utils
|
||||
Requires: java
|
||||
|
||||
%description
|
||||
The Maven Plugin Testing contains the necessary modules
|
||||
@ -83,84 +81,79 @@ Provides: maven-shared-test-tools = 1:%{version}-%{release}
|
||||
Framework to test Maven Plugins with Easymock objects.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -b .sav1
|
||||
%patch2 -b .sav2
|
||||
%patch3 -b .sav3
|
||||
%setup -q -n %{name}-%{version}%{ver_suffix}
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
mvn-rpmbuild \
|
||||
-Dmaven.test.failure.ignore=true \
|
||||
install javadoc:aggregate
|
||||
mvn-rpmbuild -Dmaven.test.failure.ignore=true install javadoc:aggregate
|
||||
#tests are skipped due to some test failures most probably caused by issues with our plexus container
|
||||
|
||||
%install
|
||||
# jars
|
||||
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
|
||||
install -m 644 maven-plugin-testing-harness/target/%{name}-harness-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{name}/%{name}-harness.jar
|
||||
install -m 644 maven-plugin-testing-tools/target/%{name}-tools-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{name}/%{name}-tools.jar
|
||||
install -m 644 maven-test-tools/target/maven-test-tools-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{name}/maven-test-tools.jar
|
||||
install -m 644 maven-plugin-testing-harness/target/%{name}-harness-%{version}%{ver_suffix}.jar \
|
||||
%{buildroot}%{_javadir}/%{name}/%{name}-harness.jar
|
||||
install -m 644 maven-plugin-testing-tools/target/%{name}-tools-%{version}%{ver_suffix}.jar \
|
||||
%{buildroot}%{_javadir}/%{name}/%{name}-tools.jar
|
||||
install -m 644 maven-test-tools/target/maven-test-tools-%{version}%{ver_suffix}.jar \
|
||||
%{buildroot}%{_javadir}/%{name}/maven-test-tools.jar
|
||||
|
||||
# poms
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
|
||||
%add_to_maven_depmap org.apache.maven.plugin-testing %{name} %{version} JPP/%{name} %{name}
|
||||
%add_to_maven_depmap org.apache.maven.shared %{name}-harness %{version} JPP/%{name} %{name}
|
||||
install -pm 644 maven-plugin-testing-harness/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-harness.pom
|
||||
%add_to_maven_depmap org.apache.maven.plugin-testing %{name}-harness %{version} JPP/%{name} %{name}-harness
|
||||
%add_to_maven_depmap org.apache.maven.shared %{name}-harness %{version} JPP/%{name} %{name}-harness
|
||||
install -pm 644 maven-plugin-testing-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-tools.pom
|
||||
%add_to_maven_depmap org.apache.maven.plugin-testing %{name}-tools %{version} JPP/%{name} %{name}-tools
|
||||
%add_to_maven_depmap org.apache.maven.shared %{name}-tools %{version} JPP/%{name} %{name}-tools
|
||||
install -pm 644 maven-test-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-test-tools.pom
|
||||
%add_to_maven_depmap org.apache.maven.plugin-testing maven-test-tools %{version} JPP/%{name} maven-test-tools
|
||||
%add_to_maven_depmap org.apache.maven.shared maven-test-tools %{version} JPP/%{name} maven-test-tools
|
||||
|
||||
# javadoc
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
cp -pr target/site/apidocs/* \
|
||||
$RPM_BUILD_ROOT%{_javadocdir}/%{name}/
|
||||
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
|
||||
#%%add_to_maven_depmap org.apache.maven.plugin-testing %{name} %{version} JPP/%{name} %{name}
|
||||
#%%add_to_maven_depmap org.apache.maven.shared %{name}-harness %{version} JPP/%{name} %{name}
|
||||
|
||||
#%%add_to_maven_depmap org.apache.maven.plugin-testing %{name}-harness %{version} JPP/%{name} %{name}-harness
|
||||
#%%add_to_maven_depmap org.apache.maven.shared %{name}-harness %{version} JPP/%{name} %{name}-harness
|
||||
|
||||
#%%add_to_maven_depmap org.apache.maven.plugin-testing %{name}-tools %{version} JPP/%{name} %{name}-tools
|
||||
#%%add_to_maven_depmap org.apache.maven.shared %{name}-tools %{version} JPP/%{name} %{name}-tools
|
||||
|
||||
#%%add_to_maven_depmap org.apache.maven.plugin-testing maven-test-tools %{version} JPP/%{name} maven-test-tools
|
||||
#%%add_to_maven_depmap org.apache.maven.shared maven-test-tools %{version} JPP/%{name} maven-test-tools
|
||||
|
||||
%add_maven_depmap -a "org.apache.maven.shared:%{name}-harness" JPP.%{name}-%{name}.pom
|
||||
%add_maven_depmap -a "org.apache.maven.shared:%{name}-harness" JPP.%{name}-%{name}-harness.pom %{name}/%{name}-harness.jar
|
||||
%add_maven_depmap -a "org.apache.maven.shared:%{name}-tools" JPP.%{name}-%{name}-tools.pom %{name}/%{name}-tools.jar
|
||||
%add_maven_depmap -a "org.apache.maven.shared:maven-test-tools" JPP.%{name}-maven-test-tools.pom %{name}/maven-test-tools.jar
|
||||
|
||||
%pre javadoc
|
||||
# workaround for rpm bug, can be removed in F-17
|
||||
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
|
||||
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
||||
|
||||
%post
|
||||
%update_maven_depmap
|
||||
|
||||
%postun
|
||||
%update_maven_depmap
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_javadir}/%{name}
|
||||
%{_mavenpomdir}/*
|
||||
%{_mavendepmapfragdir}/*
|
||||
|
||||
%files javadoc
|
||||
%defattr(-,root,root,-)
|
||||
%{_javadocdir}/*
|
||||
|
||||
%files harness
|
||||
%defattr(-,root,root,-)
|
||||
%{_javadir}/%{name}/%{name}-harness*
|
||||
|
||||
%files tools
|
||||
%defattr(-,root,root,-)
|
||||
%{_javadir}/%{name}/%{name}-tools*
|
||||
|
||||
%files -n maven-test-tools
|
||||
%defattr(-,root,root,-)
|
||||
%{_javadir}/%{name}/maven-test-tools*
|
||||
|
||||
%changelog
|
||||
* Wed Nov 09 2011 Jaromir Capik <jcapik@redhat.com> 2.0-1.alpha1
|
||||
- Update to 2.0-alpha1
|
||||
- Spec file changes according to the latest guidelines
|
||||
|
||||
* Thu Feb 10 2011 Alexander Kurtakov <akurtako@redhat.com> 1.2-9
|
||||
- Fix building.
|
||||
- Adapt to current guidelines.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user