[Jpackage-commits] dist/maven-site-plugin/devel maven-site-plugin-pom.patch, 1.1, 1.2 maven-site-plugin.spec, 1.3, 1.4

David Walluck david at ryu.zarb.org
Sat Oct 15 03:53:07 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-site-plugin/devel
In directory ryu.zarb.org:/tmp/cvs-serv27127

Modified Files:
	maven-site-plugin-pom.patch maven-site-plugin.spec 
Log Message:
- patch pom to external servlet

Index: maven-site-plugin-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-site-plugin/devel/maven-site-plugin-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-site-plugin-pom.patch	15 Oct 2011 01:44:33 -0000	1.1
--- maven-site-plugin-pom.patch	15 Oct 2011 01:53:04 -0000	1.2
***************
*** 1,5 ****
! --- maven-site-plugin-2.0.1/pom.xml~	2009-07-10 07:57:12.000000000 -0400
! +++ maven-site-plugin-2.0.1/pom.xml	2011-10-14 21:43:41.723093177 -0400
! @@ -288,6 +288,12 @@
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty</artifactId>
--- 1,5 ----
! --- maven-site-plugin-2.0.1/pom.xml.orig	2009-07-10 07:57:12.000000000 -0400
! +++ maven-site-plugin-2.0.1/pom.xml	2011-10-14 21:50:57.581384992 -0400
! @@ -288,6 +288,18 @@
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty</artifactId>
***************
*** 11,14 ****
--- 11,20 ----
  +        </exclusion>
  +      </exclusions>
+ +    </dependency>
+ +
+ +    <dependency>
+ +      <groupId>javax.servlet</groupId>
+ +      <artifactId>servlet-api</artifactId>
+ +      <version>2.5</version>
       </dependency>
   

Index: maven-site-plugin.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-site-plugin/devel/maven-site-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** maven-site-plugin.spec	15 Oct 2011 01:44:33 -0000	1.3
--- maven-site-plugin.spec	15 Oct 2011 01:53:04 -0000	1.4
***************
*** 35,38 ****
--- 35,39 ----
  Requires:       plexus-utils >= 0:1.5.1
  Requires:       jetty6 >= 0:6.1.5
+ Requires:       servlet_api >= 0:2.5
  BuildRequires:  maven2 >= 0:2.0.6
  BuildRequires:  maven-doxia-sitetools >= 0:1.0
***************
*** 50,53 ****
--- 51,55 ----
  BuildRequires:  plexus-utils >= 0:1.5.1
  BuildRequires:  jetty6 >= 0:6.1.5
+ BuildRequires:  servlet_api >= 0:2.5
  BuildRequires:  maven-shared-plugin-testing-harness >= 0:1.2
  BuildRequires:  java-devel




More information about the JPackage-commits mailing list