[pkg-java] r7690 - in trunk/surefire/debian: . patches

twerner at alioth.debian.org twerner at alioth.debian.org
Wed Dec 17 15:04:56 UTC 2008 

Author: twerner
Date: 2008-12-17 15:04:56 +0000 (Wed, 17 Dec 2008)
New Revision: 7690

Modified:
   trunk/surefire/debian/control
   trunk/surefire/debian/patches/pom.diff
Log:
enable tests


Modified: trunk/surefire/debian/control
===================================================================
--- trunk/surefire/debian/control	2008-12-17 15:03:07 UTC (rev 7689)
+++ trunk/surefire/debian/control	2008-12-17 15:04:56 UTC (rev 7690)
@@ -12,7 +12,8 @@
 
 Package: libsurefire-java
 Architecture: all
-Depends: ${misc:Depends}, default-java | java2-runtime, junit, junit4
+Depends: ${misc:Depends}, default-java | java2-runtime, junit, junit4,
+ libjmock-java
 Description: Surefire test framework for Java
  Maven is a software project management and comprehension tool. Based on the
  concept of a project object model (POM), Maven can manage a project's build,

Modified: trunk/surefire/debian/patches/pom.diff
===================================================================
--- trunk/surefire/debian/patches/pom.diff	2008-12-17 15:03:07 UTC (rev 7689)
+++ trunk/surefire/debian/patches/pom.diff	2008-12-17 15:04:56 UTC (rev 7690)
@@ -1,7 +1,7 @@
-diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
-index 330abe1..4153f46 100644
---- a/maven-surefire-plugin/pom.xml
-+++ b/maven-surefire-plugin/pom.xml
+Index: surefire-2.4.3/maven-surefire-plugin/pom.xml
+===================================================================
+--- surefire-2.4.3.orig/maven-surefire-plugin/pom.xml	2008-12-17 15:47:26.000000000 +0100
++++ surefire-2.4.3/maven-surefire-plugin/pom.xml	2008-12-17 15:47:30.000000000 +0100
 @@ -92,12 +92,15 @@
      <dependency>
        <groupId>org.apache.maven</groupId>
@@ -39,10 +39,10 @@
      </plugins>
    </build>
  
-diff --git a/pom.xml b/pom.xml
-index d8c6504..ac874a2 100644
---- a/pom.xml
-+++ b/pom.xml
+Index: surefire-2.4.3/pom.xml
+===================================================================
+--- surefire-2.4.3.orig/pom.xml	2008-12-17 15:47:26.000000000 +0100
++++ surefire-2.4.3/pom.xml	2008-12-17 16:01:46.000000000 +0100
 @@ -19,12 +19,14 @@
  
  <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">
@@ -72,7 +72,22 @@
      </dependencies>
    </dependencyManagement>
    <dependencies>
-@@ -124,10 +128,12 @@
+@@ -113,21 +117,25 @@
+       <groupId>junit</groupId>
+       <artifactId>junit</artifactId>
+       <version>3.8.1</version>
+-      <scope>test</scope>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/junit.jar</systemPath>
+     </dependency>
+     <dependency>
+       <groupId>jmock</groupId>
+       <artifactId>jmock</artifactId>
+       <version>1.0.1</version>
+-      <scope>test</scope>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/jmock.jar</systemPath>
+     </dependency>
    </dependencies>
    <build>
      <plugins>
@@ -85,7 +100,7 @@
        <plugin>
          <artifactId>maven-compiler-plugin</artifactId>
          <configuration>
-@@ -135,17 +141,19 @@
+@@ -135,17 +143,19 @@
            <target>1.3</target>
          </configuration>
        </plugin>
@@ -107,7 +122,7 @@
          <plugin>
            <artifactId>maven-release-plugin</artifactId>
            <configuration>
-@@ -160,8 +168,8 @@
+@@ -160,8 +170,8 @@
      <module>surefire-booter</module>
      <module>surefire-providers</module>
      <module>maven-surefire-plugin</module>
@@ -118,10 +133,10 @@
    </modules>
  
    <profiles>
-diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
-index 08d573c..2c26e49 100644
---- a/surefire-api/pom.xml
-+++ b/surefire-api/pom.xml
+Index: surefire-2.4.3/surefire-api/pom.xml
+===================================================================
+--- surefire-2.4.3.orig/surefire-api/pom.xml	2008-12-17 15:47:26.000000000 +0100
++++ surefire-2.4.3/surefire-api/pom.xml	2008-12-17 15:47:30.000000000 +0100
 @@ -28,6 +28,7 @@
    <name>SureFire API</name>
    <build>
@@ -161,10 +176,10 @@
      </dependency>
    </dependencies>
  </project>
-diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
-index 5f21786..a0920e4 100644
---- a/surefire-booter/pom.xml
-+++ b/surefire-booter/pom.xml
+Index: surefire-2.4.3/surefire-booter/pom.xml
+===================================================================
+--- surefire-2.4.3.orig/surefire-booter/pom.xml	2008-12-17 15:47:26.000000000 +0100
++++ surefire-2.4.3/surefire-booter/pom.xml	2008-12-17 15:47:30.000000000 +0100
 @@ -9,6 +9,7 @@
    <name>SureFire Booter</name>
    <build>
@@ -195,10 +210,10 @@
 -</project>
 \ No newline at end of file
 +</project>
-diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml
-index d10457e..3618bfd 100644
---- a/surefire-providers/pom.xml
-+++ b/surefire-providers/pom.xml
+Index: surefire-2.4.3/surefire-providers/pom.xml
+===================================================================
+--- surefire-2.4.3.orig/surefire-providers/pom.xml	2008-12-17 15:47:26.000000000 +0100
++++ surefire-2.4.3/surefire-providers/pom.xml	2008-12-17 15:47:30.000000000 +0100
 @@ -31,7 +31,7 @@
    <modules>
      <module>surefire-junit</module>
@@ -208,10 +223,10 @@
    </modules>
    <dependencies>
      <dependency>
-diff --git a/surefire-providers/surefire-junit/pom.xml b/surefire-providers/surefire-junit/pom.xml
-index 38bbba5..186d7eb 100644
---- a/surefire-providers/surefire-junit/pom.xml
-+++ b/surefire-providers/surefire-junit/pom.xml
+Index: surefire-2.4.3/surefire-providers/surefire-junit/pom.xml
+===================================================================
+--- surefire-2.4.3.orig/surefire-providers/surefire-junit/pom.xml	2008-12-17 15:47:26.000000000 +0100
++++ surefire-2.4.3/surefire-providers/surefire-junit/pom.xml	2008-12-17 15:47:30.000000000 +0100
 @@ -30,7 +30,9 @@
      <dependency>
        <groupId>junit</groupId>
@@ -223,10 +238,10 @@
      </dependency>
    </dependencies>
  </project>
-diff --git a/surefire-providers/surefire-junit4/pom.xml b/surefire-providers/surefire-junit4/pom.xml
-index caa1f36..44734c2 100644
---- a/surefire-providers/surefire-junit4/pom.xml
-+++ b/surefire-providers/surefire-junit4/pom.xml
+Index: surefire-2.4.3/surefire-providers/surefire-junit4/pom.xml
+===================================================================
+--- surefire-2.4.3.orig/surefire-providers/surefire-junit4/pom.xml	2008-12-17 15:47:26.000000000 +0100
++++ surefire-2.4.3/surefire-providers/surefire-junit4/pom.xml	2008-12-17 15:47:30.000000000 +0100
 @@ -30,7 +30,9 @@
      <dependency>
        <groupId>junit</groupId>

More information about the pkg-java-commits mailing list