Skip to content

Commit 322a9bb

Browse files
slawekjaranowskislawekjaranowski
committed
[MPLUGIN-434] Improve dependency management
- excludes in one place - exclude plexus-container-default - exclude plexus-component-api
1 parent a0ec0ba commit 322a9bb

File tree

5 files changed

+54
-32
lines changed

5 files changed

+54
-32
lines changed

‎maven-plugin-plugin/pom.xml

-21
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@
4242
</prerequisites>
4343

4444
<properties>
45-
<doxiaVersion>1.11.1</doxiaVersion>
46-
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
4745
<it.debug>true</it.debug>
4846
</properties>
4947

@@ -100,28 +98,10 @@
10098
<dependency>
10199
<groupId>org.apache.maven.doxia</groupId>
102100
<artifactId>doxia-sink-api</artifactId>
103-
<version>${doxiaVersion}</version>
104-
<exclusions>
105-
<exclusion>
106-
<groupId>org.codehaus.plexus</groupId>
107-
<artifactId>plexus-container-default</artifactId>
108-
</exclusion>
109-
</exclusions>
110101
</dependency>
111102
<dependency>
112103
<groupId>org.apache.maven.doxia</groupId>
113104
<artifactId>doxia-site-renderer</artifactId>
114-
<version>${doxia-sitetoolsVersion}</version>
115-
<exclusions>
116-
<exclusion>
117-
<groupId>org.codehaus.plexus</groupId>
118-
<artifactId>plexus-container-default</artifactId>
119-
</exclusion>
120-
<exclusion>
121-
<groupId>org.codehaus.plexus</groupId>
122-
<artifactId>plexus-component-api</artifactId>
123-
</exclusion>
124-
</exclusions>
125105
</dependency>
126106

127107
<!-- Maven -->
@@ -151,7 +131,6 @@
151131
<dependency>
152132
<groupId>org.apache.maven.reporting</groupId>
153133
<artifactId>maven-reporting-impl</artifactId>
154-
<version>${reportingImplVersion}</version>
155134
</dependency>
156135

157136
<!-- plexus -->

‎maven-plugin-report-plugin/pom.xml

-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
</prerequisites>
4141

4242
<properties>
43-
<doxiaVersion>1.11.1</doxiaVersion>
4443
<it.debug>true</it.debug>
4544
</properties>
4645

@@ -91,14 +90,12 @@
9190
<dependency>
9291
<groupId>org.apache.maven.doxia</groupId>
9392
<artifactId>doxia-sink-api</artifactId>
94-
<version>${doxiaVersion}</version>
9593
</dependency>
9694

9795
<!-- shared -->
9896
<dependency>
9997
<groupId>org.apache.maven.reporting</groupId>
10098
<artifactId>maven-reporting-impl</artifactId>
101-
<version>${reportingImplVersion}</version>
10299
</dependency>
103100

104101
<!-- plexus -->

‎maven-plugin-tools-generators/pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,7 @@
106106
<dependency>
107107
<groupId>org.apache.maven.reporting</groupId>
108108
<artifactId>maven-reporting-impl</artifactId>
109-
<version>${reportingImplVersion}</version>
110109
<scope>test</scope>
111-
<exclusions>
112-
<exclusion>
113-
<groupId>org.codehaus.plexus</groupId>
114-
<artifactId>plexus-container-default</artifactId>
115-
</exclusion>
116-
</exclusions>
117110
</dependency>
118111
<dependency>
119112
<groupId>org.apache.maven.plugin-testing</groupId>

‎maven-script/maven-script-ant/pom.xml

+12
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,23 @@ under the License.
3636
<groupId>org.apache.ant</groupId>
3737
<artifactId>ant</artifactId>
3838
<version>${antVersion}</version>
39+
<exclusions>
40+
<exclusion>
41+
<groupId>com.sun</groupId>
42+
<artifactId>tools</artifactId>
43+
</exclusion>
44+
</exclusions>
3945
</dependency>
4046
<dependency>
4147
<groupId>org.apache.ant</groupId>
4248
<artifactId>ant-launcher</artifactId>
4349
<version>${antVersion}</version>
50+
<exclusions>
51+
<exclusion>
52+
<groupId>com.sun</groupId>
53+
<artifactId>tools</artifactId>
54+
</exclusion>
55+
</exclusions>
4456
</dependency>
4557
<dependency>
4658
<groupId>org.apache.maven</groupId>

‎pom.xml

+42-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
</distributionManagement>
9393

9494
<properties>
95-
<surefire.version>2.22.2</surefire.version>
9695
<javaVersion>8</javaVersion>
9796
<pluginTestingHarnessVersion>3.3.0</pluginTestingHarnessVersion>
9897
<mavenVersion>3.2.5</mavenVersion>
@@ -102,6 +101,8 @@
102101
<antVersion>1.10.12</antVersion>
103102
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
104103
<asmVersion>9.4</asmVersion>
104+
<doxiaVersion>1.11.1</doxiaVersion>
105+
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
105106
<plexusUtilsVersion>3.4.2</plexusUtilsVersion>
106107
<reportingApiVersion>3.1.1</reportingApiVersion>
107108
<reportingImplVersion>3.2.0</reportingImplVersion>
@@ -181,6 +182,46 @@
181182
<artifactId>maven-settings</artifactId>
182183
<version>${mavenVersion}</version>
183184
</dependency>
185+
<!-- doxia -->
186+
<dependency>
187+
<groupId>org.apache.maven.doxia</groupId>
188+
<artifactId>doxia-sink-api</artifactId>
189+
<version>${doxiaVersion}</version>
190+
<exclusions>
191+
<exclusion>
192+
<groupId>org.codehaus.plexus</groupId>
193+
<artifactId>plexus-container-default</artifactId>
194+
</exclusion>
195+
</exclusions>
196+
</dependency>
197+
<dependency>
198+
<groupId>org.apache.maven.doxia</groupId>
199+
<artifactId>doxia-site-renderer</artifactId>
200+
<version>${doxia-sitetoolsVersion}</version>
201+
<exclusions>
202+
<exclusion>
203+
<groupId>org.codehaus.plexus</groupId>
204+
<artifactId>plexus-container-default</artifactId>
205+
</exclusion>
206+
<exclusion>
207+
<groupId>org.codehaus.plexus</groupId>
208+
<artifactId>plexus-component-api</artifactId>
209+
</exclusion>
210+
</exclusions>
211+
</dependency>
212+
<dependency>
213+
<groupId>org.apache.maven.reporting</groupId>
214+
<artifactId>maven-reporting-impl</artifactId>
215+
<version>${reportingImplVersion}</version>
216+
<exclusions>
217+
<exclusion>
218+
<artifactId>plexus-container-default</artifactId>
219+
<groupId>org.codehaus.plexus</groupId>
220+
</exclusion>
221+
</exclusions>
222+
</dependency>
223+
224+
184225
<dependency>
185226
<groupId>org.slf4j</groupId>
186227
<artifactId>slf4j-api</artifactId>

0 commit comments

Comments
 (0)