1 |
pterjan |
806361 |
From a1f7f0c16eb2333e527448c2e48a512ef8da50ed Mon Sep 17 00:00:00 2001 |
2 |
|
|
From: Stanislav Ochotnicky <sochotnicky@redhat.com> |
3 |
|
|
Date: Tue, 24 Apr 2012 09:04:34 +0200 |
4 |
|
|
Subject: [PATCH] Fix build by removing some unneeded dependencies |
5 |
|
|
|
6 |
|
|
--- |
7 |
|
|
pom.xml | 72 ++++++-------------------------------------------------------- |
8 |
|
|
1 files changed, 7 insertions(+), 65 deletions(-) |
9 |
|
|
|
10 |
|
|
diff --git a/pom.xml b/pom.xml |
11 |
|
|
index a806a49..e806c77 100644 |
12 |
|
|
--- a/pom.xml |
13 |
|
|
+++ b/pom.xml |
14 |
|
|
@@ -147,14 +147,6 @@ |
15 |
|
|
</plugin> |
16 |
|
|
<!-- IDE descriptors --> |
17 |
|
|
<plugin> |
18 |
|
|
- <artifactId>maven-eclipse-plugin</artifactId> |
19 |
|
|
- <configuration> |
20 |
|
|
- <downloadSources>true</downloadSources> |
21 |
|
|
- <downloadJavadocs>false</downloadJavadocs> |
22 |
|
|
- <addVersionToProjectName>true</addVersionToProjectName> |
23 |
|
|
- </configuration> |
24 |
|
|
- </plugin> |
25 |
|
|
- <plugin> |
26 |
|
|
<artifactId>maven-idea-plugin</artifactId> |
27 |
|
|
<configuration> |
28 |
|
|
<downloadSources>true</downloadSources> |
29 |
|
|
@@ -245,29 +237,6 @@ |
30 |
|
|
<plugin> |
31 |
|
|
<artifactId>maven-dependency-plugin</artifactId> |
32 |
|
|
</plugin> |
33 |
|
|
- <plugin> |
34 |
|
|
- <groupId>com.google.code.maven-license-plugin</groupId> |
35 |
|
|
- <artifactId>maven-license-plugin</artifactId> |
36 |
|
|
- <version>1.3.1</version> |
37 |
|
|
- <configuration> |
38 |
|
|
- <header>${basedir}/src/etc/header.txt</header> |
39 |
|
|
- <failIfMissing>true</failIfMissing> |
40 |
|
|
- <excludes> |
41 |
|
|
- <exclude>LICENSE.txt</exclude> |
42 |
|
|
- <exclude>NOTICE.txt</exclude> |
43 |
|
|
- <exclude>src/test/data/**</exclude> |
44 |
|
|
- <exclude>src/test/integration/**</exclude> |
45 |
|
|
- <exclude>src/test/resources/**</exclude> |
46 |
|
|
- </excludes> |
47 |
|
|
- </configuration> |
48 |
|
|
- <executions> |
49 |
|
|
- <execution> |
50 |
|
|
- <goals> |
51 |
|
|
- <goal>check</goal> |
52 |
|
|
- </goals> |
53 |
|
|
- </execution> |
54 |
|
|
- </executions> |
55 |
|
|
- </plugin> |
56 |
|
|
</plugins> |
57 |
|
|
</build> |
58 |
|
|
|
59 |
|
|
@@ -380,7 +349,12 @@ |
60 |
|
|
<dependency> |
61 |
|
|
<groupId>org.apache.maven</groupId> |
62 |
|
|
<artifactId>maven-plugin-api</artifactId> |
63 |
|
|
- <version>2.0.9</version> |
64 |
|
|
+ <version>2.2.1</version> |
65 |
|
|
+ </dependency> |
66 |
|
|
+ <dependency> |
67 |
|
|
+ <groupId>org.apache.maven</groupId> |
68 |
|
|
+ <artifactId>maven-compat</artifactId> |
69 |
|
|
+ <version>2.2.1</version> |
70 |
|
|
</dependency> |
71 |
|
|
<dependency> |
72 |
|
|
<groupId>com.mycila.xmltool</groupId> |
73 |
|
|
@@ -403,38 +377,6 @@ |
74 |
|
|
<artifactId>plexus-utils</artifactId> |
75 |
|
|
<version>1.5.1</version> |
76 |
|
|
</dependency> |
77 |
|
|
- <!-- testing --> |
78 |
|
|
- <dependency> |
79 |
|
|
- <groupId>org.testng</groupId> |
80 |
|
|
- <artifactId>testng</artifactId> |
81 |
|
|
- <version>5.7</version> |
82 |
|
|
- <classifier>jdk15</classifier> |
83 |
|
|
- <scope>test</scope> |
84 |
|
|
- <exclusions> |
85 |
|
|
- <exclusion> |
86 |
|
|
- <groupId>junit</groupId> |
87 |
|
|
- <artifactId>junit</artifactId> |
88 |
|
|
- </exclusion> |
89 |
|
|
- </exclusions> |
90 |
|
|
- </dependency> |
91 |
|
|
- <dependency> |
92 |
|
|
- <groupId>org.apache.maven</groupId> |
93 |
|
|
- <artifactId>maven-embedder</artifactId> |
94 |
|
|
- <version>2.0.4</version> |
95 |
|
|
- <scope>test</scope> |
96 |
|
|
- </dependency> |
97 |
|
|
- <dependency> |
98 |
|
|
- <groupId>org.apache.maven.plugin-testing</groupId> |
99 |
|
|
- <artifactId>maven-plugin-testing-harness</artifactId> |
100 |
|
|
- <version>1.2</version> |
101 |
|
|
- <scope>test</scope> |
102 |
|
|
- <exclusions> |
103 |
|
|
- <exclusion> |
104 |
|
|
- <groupId>junit</groupId> |
105 |
|
|
- <artifactId>junit</artifactId> |
106 |
|
|
- </exclusion> |
107 |
|
|
- </exclusions> |
108 |
|
|
- </dependency> |
109 |
|
|
</dependencies> |
110 |
|
|
|
111 |
|
|
-</project> |
112 |
|
|
\ No newline at end of file |
113 |
|
|
+</project> |
114 |
|
|
-- |
115 |
|
|
1.7.7.6 |
116 |
|
|
|