[pkg-java] r7679 - trunk/maven-site-plugin/debian/patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-15 22:42:21 +0000 (Mon, 15 Dec 2008)
New Revision: 7679

Modified:
   trunk/maven-site-plugin/debian/patches/pom.diff
Log:
disable maven-plugin-testing-harness


Modified: trunk/maven-site-plugin/debian/patches/pom.diff
===================================================================
--- trunk/maven-site-plugin/debian/patches/pom.diff	2008-12-15 22:36:54 UTC (rev 7678)
+++ trunk/maven-site-plugin/debian/patches/pom.diff	2008-12-15 22:42:21 UTC (rev 7679)
@@ -1,8 +1,8 @@
-diff --git a/pom.xml b/pom.xml
-index 7427d08..9daa0d3 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -19,13 +19,16 @@ under the License.
+Index: maven-site-plugin-2.0~beta7/pom.xml
+===================================================================
+--- maven-site-plugin-2.0~beta7.orig/pom.xml	2008-06-26 20:38:32.000000000 +0200
++++ maven-site-plugin-2.0~beta7/pom.xml	2008-12-15 23:38:38.000000000 +0100
+@@ -19,13 +19,16 @@
  -->
  
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -19,7 +19,7 @@
    <artifactId>maven-site-plugin</artifactId>
    <packaging>maven-plugin</packaging>
    <name>Maven Site Plugin</name>
-@@ -154,14 +157,26 @@ under the License.
+@@ -154,14 +157,26 @@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-plugin-plugin</artifactId>
@@ -48,7 +48,7 @@
        </plugin>
      </plugins>
    </build>
-@@ -214,6 +229,14 @@ under the License.
+@@ -214,6 +229,14 @@
      <!-- Maven -->
      <dependency>
        <groupId>org.apache.maven</groupId>
@@ -63,7 +63,7 @@
        <artifactId>maven-artifact</artifactId>
        <version>2.0.2</version>
      </dependency>
-@@ -247,17 +270,29 @@ under the License.
+@@ -247,17 +270,29 @@
        <artifactId>maven-reporting-api</artifactId>
        <version>2.0.4</version>
      </dependency>
@@ -93,7 +93,7 @@
      </dependency>
  
      <!-- Doxia-sitetools -->
-@@ -265,6 +300,8 @@ under the License.
+@@ -265,6 +300,8 @@
        <groupId>org.apache.maven.doxia</groupId>
        <artifactId>doxia-decoration-model</artifactId>
        <version>${doxiaSitetoolsVersion}</version>
@@ -102,7 +102,7 @@
        <exclusions>
          <exclusion>
            <groupId>org.codehaus.plexus</groupId>
-@@ -280,6 +317,8 @@ under the License.
+@@ -280,6 +317,8 @@
        <groupId>org.apache.maven.doxia</groupId>
        <artifactId>doxia-site-renderer</artifactId>
        <version>${doxiaSitetoolsVersion}</version>
@@ -111,7 +111,7 @@
        <exclusions>
          <exclusion>
            <groupId>org.codehaus.plexus</groupId>
-@@ -303,23 +342,29 @@ under the License.
+@@ -303,23 +342,29 @@
        <groupId>org.apache.maven.wagon</groupId>
        <artifactId>wagon-provider-api</artifactId>
        <version>${wagonVersion}</version>
@@ -142,7 +142,7 @@
        <exclusions>
          <exclusion>
            <groupId>org.codehaus.plexus</groupId>
-@@ -327,6 +372,7 @@ under the License.
+@@ -327,6 +372,7 @@
          </exclusion>
        </exclusions>
      </dependency>
@@ -150,7 +150,7 @@
      <dependency>
        <groupId>org.codehaus.plexus</groupId>
        <artifactId>plexus-utils</artifactId>
-@@ -338,6 +384,14 @@ under the License.
+@@ -338,14 +384,24 @@
        <artifactId>jetty</artifactId>
        <version>6.1.5</version>
      </dependency>
@@ -164,4 +164,14 @@
 +    </dependency>
  
      <!-- test -->
++    <!--
      <dependency>
+       <groupId>org.apache.maven.shared</groupId>
+       <artifactId>maven-plugin-testing-harness</artifactId>
+       <version>1.0-beta-1</version>
+       <scope>test</scope>
+     </dependency>
++    -->
+   </dependencies>
+ 
+   <reporting>