Skip to content

Commit ca6a073

Browse files
michael-omichael-o
committed
[MPLUGIN-526] Clean up dependencies reported by dependencies:analyze
This closes #287
1 parent 993425c commit ca6a073

File tree

7 files changed

+140
-18
lines changed

7 files changed

+140
-18
lines changed

‎maven-plugin-plugin/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@
103103
<artifactId>maven-model</artifactId>
104104
<scope>provided</scope>
105105
</dependency>
106+
<dependency>
107+
<groupId>org.apache.maven</groupId>
108+
<artifactId>maven-settings</artifactId>
109+
<scope>provided</scope>
110+
</dependency>
106111
<dependency>
107112
<groupId>org.apache.maven</groupId>
108113
<artifactId>maven-repository-metadata</artifactId>
@@ -114,6 +119,17 @@
114119
<artifactId>maven-artifact</artifactId>
115120
<scope>provided</scope>
116121
</dependency>
122+
<dependency>
123+
<groupId>org.apache.maven.resolver</groupId>
124+
<artifactId>maven-resolver-api</artifactId>
125+
<version>${resolverVersion}</version>
126+
<scope>provided</scope>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.apache.maven.resolver</groupId>
130+
<artifactId>maven-resolver-util</artifactId>
131+
<version>${resolverVersion}</version>
132+
</dependency>
117133

118134
<!-- plexus -->
119135
<dependency>

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
<properties>
4141
<it.debug>true</it.debug>
42+
<doxiaVersion>1.11.1</doxiaVersion>
4243
</properties>
4344

4445
<dependencies>
@@ -57,6 +58,11 @@
5758
<groupId>org.apache.maven.reporting</groupId>
5859
<artifactId>maven-reporting-api</artifactId>
5960
</dependency>
61+
<dependency>
62+
<groupId>org.apache.maven</groupId>
63+
<artifactId>maven-model-builder</artifactId>
64+
<scope>provided</scope>
65+
</dependency>
6066
<dependency>
6167
<groupId>org.apache.maven</groupId>
6268
<artifactId>maven-model</artifactId>
@@ -67,6 +73,12 @@
6773
<artifactId>maven-artifact</artifactId>
6874
<scope>provided</scope>
6975
</dependency>
76+
<dependency>
77+
<groupId>org.apache.maven.resolver</groupId>
78+
<artifactId>maven-resolver-api</artifactId>
79+
<version>${resolverVersion}</version>
80+
<scope>provided</scope>
81+
</dependency>
7082

7183
<!-- plugin tools -->
7284
<dependency>
@@ -86,7 +98,12 @@
8698
<dependency>
8799
<groupId>org.apache.maven.doxia</groupId>
88100
<artifactId>doxia-sink-api</artifactId>
89-
<version>1.11.1</version>
101+
<version>${doxiaVersion}</version>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.apache.maven.doxia</groupId>
105+
<artifactId>doxia-core</artifactId>
106+
<version>${doxiaVersion}</version>
90107
</dependency>
91108

92109
<!-- shared -->
@@ -101,12 +118,11 @@
101118
<version>3.8.1</version>
102119
<!--same version as used by doxia site renderer -->
103120
</dependency>
104-
<!-- plexus -->
121+
<!-- Plexus -->
105122
<dependency>
106123
<groupId>org.codehaus.plexus</groupId>
107-
<artifactId>plexus-utils</artifactId>
124+
<artifactId>plexus-xml</artifactId>
108125
</dependency>
109-
<!-- Plexus -->
110126
<dependency>
111127
<groupId>org.codehaus.plexus</groupId>
112128
<artifactId>plexus-i18n</artifactId>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
<groupId>org.apache.maven</groupId>
4949
<artifactId>maven-artifact</artifactId>
5050
</dependency>
51+
<dependency>
52+
<groupId>org.apache.maven</groupId>
53+
<artifactId>maven-settings</artifactId>
54+
</dependency>
5155
<dependency>
5256
<groupId>org.apache.maven.plugin-tools</groupId>
5357
<artifactId>maven-plugin-tools-api</artifactId>
@@ -56,6 +60,11 @@
5660
<groupId>org.apache.maven.plugin-tools</groupId>
5761
<artifactId>maven-plugin-annotations</artifactId>
5862
</dependency>
63+
<dependency>
64+
<groupId>org.apache.maven.resolver</groupId>
65+
<artifactId>maven-resolver-api</artifactId>
66+
<version>${resolverVersion}</version>
67+
</dependency>
5968
<dependency>
6069
<groupId>org.slf4j</groupId>
6170
<artifactId>slf4j-api</artifactId>
@@ -73,6 +82,12 @@
7382
<groupId>org.codehaus.plexus</groupId>
7483
<artifactId>plexus-archiver</artifactId>
7584
</dependency>
85+
<dependency>
86+
<groupId>javax.inject</groupId>
87+
<artifactId>javax.inject</artifactId>
88+
<version>1</version>
89+
<scope>provided</scope>
90+
</dependency>
7691

7792
<dependency>
7893
<groupId>org.ow2.asm</groupId>
@@ -111,6 +126,12 @@
111126
<artifactId>plexus-testing</artifactId>
112127
<scope>test</scope>
113128
</dependency>
129+
<dependency>
130+
<groupId>net.bytebuddy</groupId>
131+
<artifactId>byte-buddy</artifactId>
132+
<version>1.11.13</version>
133+
<scope>test</scope>
134+
</dependency>
114135
<dependency>
115136
<groupId>org.assertj</groupId>
116137
<artifactId>assertj-core</artifactId>

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,30 @@
5757
<groupId>org.apache.maven.reporting</groupId>
5858
<artifactId>maven-reporting-api</artifactId>
5959
</dependency>
60+
<dependency>
61+
<groupId>org.apache.maven</groupId>
62+
<artifactId>maven-settings</artifactId>
63+
</dependency>
64+
<dependency>
65+
<groupId>javax.inject</groupId>
66+
<artifactId>javax.inject</artifactId>
67+
<version>1</version>
68+
<scope>provided</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.apache.maven.resolver</groupId>
72+
<artifactId>maven-resolver-api</artifactId>
73+
<version>${resolverVersion}</version>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.codehaus.plexus</groupId>
77+
<artifactId>plexus-classworlds</artifactId>
78+
<version>2.7.0</version>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.eclipse.sisu</groupId>
82+
<artifactId>org.eclipse.sisu.plexus</artifactId>
83+
</dependency>
6084
<!-- plexus -->
6185
<dependency>
6286
<groupId>org.codehaus.plexus</groupId>
@@ -81,7 +105,7 @@
81105
<dependency>
82106
<groupId>org.apache.maven.wagon</groupId>
83107
<artifactId>wagon-provider-api</artifactId>
84-
<version>2.4</version>
108+
<version>3.5.3</version>
85109
</dependency>
86110
<!-- for parsing java/javadoc versions -->
87111
<dependency>

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

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,50 @@
4343
<groupId>org.apache.maven</groupId>
4444
<artifactId>maven-model</artifactId>
4545
</dependency>
46+
<dependency>
47+
<groupId>org.apache.maven</groupId>
48+
<artifactId>maven-core</artifactId>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.maven</groupId>
52+
<artifactId>maven-artifact</artifactId>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.apache.maven</groupId>
56+
<artifactId>maven-plugin-api</artifactId>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.apache.maven</groupId>
60+
<artifactId>maven-settings</artifactId>
61+
</dependency>
4662

4763
<!-- plexus -->
4864
<dependency>
4965
<groupId>org.codehaus.plexus</groupId>
5066
<artifactId>plexus-utils</artifactId>
5167
</dependency>
68+
<dependency>
69+
<groupId>org.codehaus.plexus</groupId>
70+
<artifactId>plexus-xml</artifactId>
71+
</dependency>
5272
<dependency>
5373
<groupId>org.codehaus.plexus</groupId>
5474
<artifactId>plexus-velocity</artifactId>
5575
</dependency>
76+
<dependency>
77+
<groupId>org.eclipse.sisu</groupId>
78+
<artifactId>org.eclipse.sisu.plexus</artifactId>
79+
</dependency>
5680

5781
<!-- other -->
5882
<dependency>
5983
<groupId>org.apache.velocity</groupId>
6084
<artifactId>velocity</artifactId>
6185
</dependency>
62-
6386
<dependency>
64-
<groupId>org.ow2.asm</groupId>
65-
<artifactId>asm</artifactId>
66-
</dependency>
67-
<dependency>
68-
<groupId>org.ow2.asm</groupId>
69-
<artifactId>asm-commons</artifactId>
87+
<groupId>org.slf4j</groupId>
88+
<artifactId>slf4j-api</artifactId>
89+
<version>${slf4jVersion}</version>
7090
</dependency>
7191

7292
<!-- for HTML to plain text conversion -->

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

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,31 +41,50 @@
4141
<!-- maven -->
4242
<dependency>
4343
<groupId>org.apache.maven</groupId>
44-
<artifactId>maven-model</artifactId>
44+
<artifactId>maven-artifact</artifactId>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.apache.maven</groupId>
48+
<artifactId>maven-plugin-api</artifactId>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.maven</groupId>
52+
<artifactId>maven-core</artifactId>
4553
</dependency>
4654
<dependency>
4755
<groupId>org.apache.maven.plugin-tools</groupId>
4856
<artifactId>maven-plugin-tools-api</artifactId>
4957
</dependency>
5058

5159
<!-- plexus -->
52-
<dependency>
53-
<groupId>org.codehaus.plexus</groupId>
54-
<artifactId>plexus-utils</artifactId>
55-
</dependency>
5660
<dependency>
5761
<groupId>org.eclipse.sisu</groupId>
5862
<artifactId>org.eclipse.sisu.plexus</artifactId>
59-
<scope>compile</scope>
6063
</dependency>
6164

6265
<!-- misc -->
6366
<dependency>
6467
<groupId>com.thoughtworks.qdox</groupId>
6568
<artifactId>qdox</artifactId>
6669
</dependency>
70+
<dependency>
71+
<groupId>javax.inject</groupId>
72+
<artifactId>javax.inject</artifactId>
73+
<version>1</version>
74+
<scope>provided</scope>
75+
</dependency>
6776

6877
<!-- test -->
78+
<dependency>
79+
<groupId>org.apache.maven</groupId>
80+
<artifactId>maven-model</artifactId>
81+
<scope>test</scope>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.codehaus.plexus</groupId>
85+
<artifactId>plexus-utils</artifactId>
86+
<scope>test</scope>
87+
</dependency>
6988
<dependency>
7089
<groupId>org.junit.jupiter</groupId>
7190
<artifactId>junit-jupiter-engine</artifactId>

‎pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
<pluginTestingHarnessVersion>3.3.0</pluginTestingHarnessVersion>
9595
<maven4Version>4.0.0-alpha-4</maven4Version>
9696
<maven3Version>3.9.6</maven3Version>
97+
<resolverVersion>1.9.18</resolverVersion>
9798
<slf4jVersion>1.7.36</slf4jVersion>
9899
<antVersion>1.10.14</antVersion>
99100
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
@@ -158,6 +159,11 @@
158159
<artifactId>maven-plugin-plugin</artifactId>
159160
<version>${project.version}</version>
160161
</dependency>
162+
<dependency>
163+
<groupId>org.apache.maven</groupId>
164+
<artifactId>maven-model-builder</artifactId>
165+
<version>${maven3Version}</version>
166+
</dependency>
161167
<dependency>
162168
<groupId>org.apache.maven</groupId>
163169
<artifactId>maven-model</artifactId>

0 commit comments

Comments
 (0)