~ubuntu-branches/ubuntu/precise/surefire/precise

« back to all changes in this revision

Viewing changes to debian/patches/pom.patch

  • Committer: Bazaar Package Importer
  • Author(s): Miguel Landaeta
  • Date: 2011-10-10 20:42:16 UTC
  • mfrom: (2.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20111010204216-cemva69wkagf4fay
Tags: 2.10-1
* Team upload.
* New upstream release.
* Refresh and remove unneccesary patches.
* Add Build-Depends on libsurefire-java and
  libmaven-common-artifact-filters-java.
* Drop outdated Maven artifact surefire-junit.
* Provide new Maven artifacts: surefire-junit3, maven-surefire-common,
  common-junit3, common-junit4, surefire-junit47 and surefire-testng-utils.
* Fix clean target to allow "two in a row" builds.
* Update Vcs-Browser field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
--- a/pom.xml
2
 
+++ b/pom.xml
3
 
@@ -19,12 +19,6 @@
4
 
 
5
 
 <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">
 
1
Description: Disable Maven artifacts not available in Debian
 
2
Author: Miguel Landaeta <miguel@miguel.cc>
 
3
Forwarded: no
 
4
Last-Update: 2011-10-10
 
5
 
 
6
--- surefire-2.10.orig/pom.xml
 
7
+++ surefire-2.10/pom.xml
 
8
@@ -20,12 +20,6 @@
 
9
 <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/xsd/maven-4.0.0.xsd">
6
10
   <modelVersion>4.0.0</modelVersion>
 
11
 
7
12
-  <parent>
8
13
-    <artifactId>maven-parent</artifactId>
9
14
-    <groupId>org.apache.maven</groupId>
10
 
-    <version>7</version>
 
15
-    <version>20</version>
11
16
-    <relativePath>../pom/maven/pom.xml</relativePath>
12
17
-  </parent>
 
18
 
13
19
   <groupId>org.apache.maven.surefire</groupId>
14
20
   <artifactId>surefire</artifactId>
15
 
   <packaging>pom</packaging>
16
 
@@ -122,7 +116,7 @@
17
 
       <scope>test</scope>
 
21
@@ -226,7 +220,7 @@
18
22
     </dependency>
19
23
   </dependencies>
 
24
 
20
25
-  <build>
21
26
+<!--  <build>
22
27
     <plugins>
23
28
       <plugin>
24
 
         <artifactId>maven-site-plugin</artifactId>
25
 
@@ -154,7 +148,7 @@
 
29
         <artifactId>maven-compiler-plugin</artifactId>
 
30
@@ -241,8 +235,9 @@
 
31
         <plugin>
 
32
           <artifactId>maven-surefire-plugin</artifactId>
 
33
           <version>${shadedVersion}</version>
 
34
-          <configuration>
 
35
+          <configuration>-->
 
36
             <!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! -->
 
37
+            <!--
 
38
             <useSystemClassLoader>false</useSystemClassLoader>
 
39
           </configuration>
 
40
         </plugin>
 
41
@@ -267,7 +262,7 @@
26
42
         </plugin>
27
43
       </plugins>
28
44
     </pluginManagement>
29
45
-  </build>
30
 
+  </build> -->
31
 
   <modules>
32
 
     <module>surefire-api</module>
33
 
     <module>surefire-booter</module>
 
46
+  </build>-->
 
47
 
 
48
   <profiles>
 
49
     <!-- use preinstalled JDK 1.3 to build and test -->