Package: maven2 / 2.2.1-12+deb7u1

pom.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,7 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>11</version>
-    <relativePath>../pom/maven/pom.xml</relativePath>
-  </parent>
-
+  <groupId>org.apache.maven</groupId>
   <artifactId>maven</artifactId>
   <version>2.2.1</version>
   <packaging>pom</packaging>
@@ -121,6 +115,7 @@
     <url>http://svn.apache.org/viewvc/maven/maven-2/tags/maven-2.2.1</url>
   </scm>
 
+<!-- disable build section -
   <build>
     <pluginManagement>
       <plugins>
@@ -214,7 +209,7 @@
           <artifactId>clirr-maven-plugin</artifactId>
           <version>2.2.1</version>
           <configuration>
-            <!-- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT -->
+            <- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT -
             <comparisonVersion>2.2.0</comparisonVersion>
             <excludes>
               <exclude>org/apache/maven/artifact/manager/WagonManager*</exclude>
@@ -248,8 +243,10 @@
       </plugin>
     </plugins>
   </build>
+-->
 
   <modules>
+<!-- keep only the modules required for the build -
     <module>maven-artifact</module>
     <module>maven-artifact-manager</module>
     <module>maven-artifact-test</module>
@@ -269,6 +266,7 @@
     <module>maven-script</module>
     <module>maven-settings</module>
     <module>maven-toolchain</module>
+-->
     <module>apache-maven</module>
   </modules>
 
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -32,19 +32,8 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>basedir</name>
-              <value>${basedir}</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>
-      <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>1.2</version>
+        <version>1.2.1</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -60,8 +49,17 @@
                 true
               </keepDependenciesWithProvidedScope>
               <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
+                <org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer />
               </transformers>
+              <filters>
+                <!-- remove the META-INF/services folder from xerces as we want to use the default Jdk-provided services -->
+                <filter>
+                  <artifact>xerces:xercesImpl</artifact>
+                  <excludes>
+                    <exclude>META-INF/services/**</exclude>
+                  </excludes>
+                </filter>
+              </filters>
               <artifactSet>
                 <excludes>
                   <exclude>
@@ -122,6 +120,7 @@
           </execution>
         </executions>
       </plugin>
+<!-- disable the assembly plugin -
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.2-beta-4</version>
@@ -140,6 +139,7 @@
           </execution>
         </executions>
       </plugin>
+-->
     </plugins>
   </build>