rpms/maven-project-info-reports-plugin/devel RepositoryUtils.java.patch, NONE, 1.1 import.log, NONE, 1.1 maven-project-info-reports-plugin-pom.patch, NONE, 1.1 maven-project-info-reports-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Hui Wang huwang at fedoraproject.org
Tue Jun 8 01:11:12 UTC 2010 

Author: huwang

Update of /cvs/pkgs/rpms/maven-project-info-reports-plugin/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30774/devel

Modified Files:
	.cvsignore sources 
Added Files:
	RepositoryUtils.java.patch import.log 
	maven-project-info-reports-plugin-pom.patch 
	maven-project-info-reports-plugin.spec 
Log Message:
* Tue Jun 08 2010 Hui Wang <huwang at redhat.com>
- Imported maven-project-info-reports-plugin to CVS


RepositoryUtils.java.patch:
 RepositoryUtils.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE RepositoryUtils.java.patch ---
--- src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java.orig	2010-05-14 05:06:08.000000000 +0800
+++ src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java	2010-06-03 18:22:15.000000000 +0800
@@ -165,7 +165,7 @@
             return false;
         }
 
-        repo = wagonManager.getMirrorRepository( repo );
+        //repo = wagonManager.getMirrorRepository( repo );
         
         String id = repo.getId();
         Repository repository = new Repository( id, repo.getUrl() );


--- NEW FILE import.log ---
maven-project-info-reports-plugin-2_2-2:HEAD:maven-project-info-reports-plugin-2.2-2.src.rpm:1275959250

maven-project-info-reports-plugin-pom.patch:
 pom.xml |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE maven-project-info-reports-plugin-pom.patch ---
--- pom.xml.orig	2010-05-16 05:26:51.000000000 +0800
+++ pom.xml	2010-06-04 15:10:48.000000000 +0800
@@ -77,7 +77,7 @@
   <properties>
     <doxiaVersion>1.1.2</doxiaVersion>
     <doxia-sitetoolsVersion>1.1.2</doxia-sitetoolsVersion>
-    <mavenVersion>2.1.0</mavenVersion>
+    <mavenVersion>2.0.8</mavenVersion>
     <wagonVersion>1.0-beta-3</wagonVersion>
     <scmVersion>1.3</scmVersion>
     <sitePluginVersion>2.1</sitePluginVersion>
@@ -319,12 +319,6 @@
       <version>1.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit-addons</groupId>
-      <artifactId>junit-addons</artifactId>
-      <version>1.4</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <profiles>


--- NEW FILE maven-project-info-reports-plugin.spec ---
Name:           maven-project-info-reports-plugin
Version:        2.2
Release:        2%{?dist}
Summary:        Maven Project Info Reports Plugin

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://maven.apache.org/plugins/maven-project-info-reports-plugin/
#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-project-info-reports-plugin-2.2/
#tar jcf maven-project-info-reports-plugin-2.2.tar.bz2 maven-project-info-reports-plugin-2.2/
Source0:        %{name}-%{version}.tar.bz2
#- Modified maven version from 2.1.0 to 2.0.8 which is available now in koji,
#  will remove this from patch once maven is upgraded to version 2.2.1.
#- Removed junit-addons dependency as there is no junit-addons available in koji, meanwhile set test skip as true.
Patch0:        %{name}-pom.patch
#Method getMirrorRepository is new method of org.apache.maven.artifact.manager.WagonManager, it is not available in maven 2.0.8
#will remove this patch once maven is upgraded to version 2.2.1
Patch1:        RepositoryUtils.java.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch

BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: maven2
BuildRequires: maven-plugin-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-shared-reporting-api
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-shared-dependency-tree 
BuildRequires: maven-doxia-tools
BuildRequires: maven-shared-jar
BuildRequires: maven-wagon
BuildRequires: maven-scm
BuildRequires: maven-doxia
BuildRequires: plexus-container-default
BuildRequires: plexus-component-api
BuildRequires: plexus-i18n
BuildRequires: plexus-utils
BuildRequires: commons-validator
BuildRequires: httpunit
BuildRequires: maven-plugin-testing-harness
BuildRequires: tomcat5

Requires:       maven2
Requires:       java
Requires:       jpackage-utils
Requires:       plexus-container-default
Requires:       plexus-component-api
Requires:       plexus-i18n
Requires:       plexus-utils
Requires:       commons-validator
Requires:       httpunit
Requires:       tomcat5

Requires(post):       jpackage-utils
Requires(postun):     jpackage-utils

Obsoletes: maven2-plugin-project-info-reports <= 0:2.0.8
Provides: maven2-plugin-project-info-reports = 0:%{version}-%{release}

%description
The Maven Project Info Reports Plugin is a plugin 
that generates standard reports for the specified project.
  

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}
Requires:       jpackage-utils

%description javadoc
API documentation for %{name}.


%prep
%setup -q 
%patch0 -p0
%patch1 -p0

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
        -e \
        -Dmaven2.jpp.mode=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven.test.skip=true \
        install javadoc:javadoc

%install
rm -rf %{buildroot}

# jars
install -Dpm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}-%{version}.jar

(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}

# poms
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/api*

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Mon Jun 07 2010 Hui Wang <huwang at redhat.com> - 2.2-2
- Added missing requires

* Thu Jun 02 2010 Hui Wang <huwang at redhat.com> - 2.2-1
- Initial version of the package

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-project-info-reports-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	7 Jun 2010 21:25:26 -0000	1.1
+++ .cvsignore	8 Jun 2010 01:11:11 -0000	1.2
@@ -0,0 +1 @@
+maven-project-info-reports-plugin-2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-project-info-reports-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	7 Jun 2010 21:25:26 -0000	1.1
+++ sources	8 Jun 2010 01:11:12 -0000	1.2
@@ -0,0 +1 @@
+2c9099e54860fd135f4bc7b5121dba9e  maven-project-info-reports-plugin-2.2.tar.bz2

More information about the scm-commits mailing list