Skip to content

Commit e15e7d7

Browse files
committed
[MRELEASE-1094] Clean up dependencies
This closes #144
1 parent cc7d3b6 commit e15e7d7

File tree

5 files changed

+53
-29
lines changed

5 files changed

+53
-29
lines changed

maven-release-api/pom.xml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<name>Maven Release APIs</name>
3232
<description>APIs to implement to extend maven-release-plugin.</description>
33-
33+
3434
<dependencies>
3535
<dependency>
3636
<groupId>org.apache.maven</groupId>
@@ -52,20 +52,28 @@
5252
<groupId>org.apache.maven</groupId>
5353
<artifactId>maven-settings</artifactId>
5454
</dependency>
55+
<dependency>
56+
<groupId>org.eclipse.aether</groupId>
57+
<artifactId>aether-api</artifactId>
58+
</dependency>
5559
<dependency>
5660
<groupId>org.eclipse.aether</groupId>
5761
<artifactId>aether-util</artifactId>
5862
</dependency>
63+
<dependency>
64+
<groupId>org.codehaus.plexus</groupId>
65+
<artifactId>plexus-utils</artifactId>
66+
</dependency>
5967

6068
<dependency>
6169
<groupId>org.slf4j</groupId>
6270
<artifactId>slf4j-api</artifactId>
6371
</dependency>
64-
72+
6573
<dependency>
6674
<groupId>junit</groupId>
6775
<artifactId>junit</artifactId>
6876
<scope>test</scope>
6977
</dependency>
7078
</dependencies>
71-
</project>
79+
</project>

maven-release-manager/pom.xml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<artifactId>maven-release-api</artifactId>
3838
<version>${project.version}</version>
3939
</dependency>
40-
4140
<dependency>
4241
<groupId>org.codehaus.plexus</groupId>
4342
<artifactId>plexus-utils</artifactId>
@@ -74,6 +73,10 @@
7473
<groupId>org.apache.maven</groupId>
7574
<artifactId>maven-model</artifactId>
7675
</dependency>
76+
<dependency>
77+
<groupId>org.apache.maven</groupId>
78+
<artifactId>maven-model-builder</artifactId>
79+
</dependency>
7780
<dependency>
7881
<groupId>org.apache.maven</groupId>
7982
<artifactId>maven-artifact</artifactId>
@@ -86,6 +89,10 @@
8689
<groupId>org.apache.maven</groupId>
8790
<artifactId>maven-settings</artifactId>
8891
</dependency>
92+
<dependency>
93+
<groupId>org.apache.maven</groupId>
94+
<artifactId>maven-plugin-api</artifactId>
95+
</dependency>
8996

9097
<dependency>
9198
<groupId>org.slf4j</groupId>
@@ -118,11 +125,6 @@
118125
<groupId>org.eclipse.aether</groupId>
119126
<artifactId>aether-api</artifactId>
120127
</dependency>
121-
<dependency>
122-
<groupId>org.eclipse.aether</groupId>
123-
<artifactId>aether-util</artifactId>
124-
</dependency>
125-
126128

127129
<!-- scm dependencies -->
128130
<dependency>
@@ -146,14 +148,8 @@
146148
</dependency>
147149
<dependency>
148150
<groupId>org.apache.maven.shared</groupId>
149-
<artifactId>maven-artifact-transfer</artifactId>
150-
<version>0.13.1</version>
151-
<exclusions>
152-
<exclusion>
153-
<groupId>org.sonatype.sisu</groupId>
154-
<artifactId>sisu-inject-plexus</artifactId>
155-
</exclusion>
156-
</exclusions>
151+
<artifactId>maven-shared-utils</artifactId>
152+
<version>3.3.4</version>
157153
</dependency>
158154

159155
<dependency>
@@ -198,6 +194,16 @@
198194
<scope>test</scope>
199195
</dependency>
200196

197+
<dependency>
198+
<groupId>org.eclipse.aether</groupId>
199+
<artifactId>aether-util</artifactId>
200+
<scope>test</scope>
201+
</dependency>
202+
<dependency>
203+
<groupId>org.eclipse.aether</groupId>
204+
<artifactId>aether-impl</artifactId>
205+
<scope>test</scope>
206+
</dependency>
201207
<dependency>
202208
<groupId>org.eclipse.aether</groupId>
203209
<artifactId>aether-connector-basic</artifactId>

maven-release-plugin/pom.xml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
</prerequisites>
4040

4141
<dependencies>
42+
<dependency>
43+
<groupId>org.apache.maven.release</groupId>
44+
<artifactId>maven-release-api</artifactId>
45+
<version>${project.version}</version>
46+
</dependency>
4247
<dependency>
4348
<groupId>org.apache.maven.release</groupId>
4449
<artifactId>maven-release-manager</artifactId>
@@ -64,6 +69,10 @@
6469
<groupId>org.apache.maven</groupId>
6570
<artifactId>maven-settings</artifactId>
6671
</dependency>
72+
<dependency>
73+
<groupId>org.apache.maven</groupId>
74+
<artifactId>maven-artifact</artifactId>
75+
</dependency>
6776
<dependency>
6877
<groupId>org.apache.maven.scm</groupId>
6978
<artifactId>maven-scm-api</artifactId>
@@ -72,10 +81,6 @@
7281
<groupId>org.codehaus.plexus</groupId>
7382
<artifactId>plexus-utils</artifactId>
7483
</dependency>
75-
<dependency>
76-
<groupId>org.jdom</groupId>
77-
<artifactId>jdom2</artifactId>
78-
</dependency>
7984

8085
<!-- verified with ITs -->
8186
<dependency>
@@ -112,6 +117,11 @@
112117
<version>3.3.0</version>
113118
<scope>test</scope>
114119
</dependency>
120+
<dependency>
121+
<groupId>org.slf4j</groupId>
122+
<artifactId>slf4j-simple</artifactId>
123+
<scope>test</scope>
124+
</dependency>
115125
</dependencies>
116126

117127
<build>

maven-release-policies/maven-release-oddeven-policy/pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,8 @@
5151
<artifactId>maven-artifact</artifactId>
5252
</dependency>
5353
<dependency>
54-
<groupId>org.eclipse.aether</groupId>
55-
<artifactId>aether-api</artifactId>
56-
<scope>compile</scope>
57-
</dependency>
58-
<dependency>
59-
<groupId>org.eclipse.aether</groupId>
60-
<artifactId>aether-util</artifactId>
61-
<scope>compile</scope>
54+
<groupId>org.codehaus.plexus</groupId>
55+
<artifactId>plexus-utils</artifactId>
6256
</dependency>
6357

6458
<dependency>

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,12 @@
161161
<version>${mavenVersion}</version>
162162
<scope>provided</scope>
163163
</dependency>
164+
<dependency>
165+
<groupId>org.apache.maven</groupId>
166+
<artifactId>maven-model-builder</artifactId>
167+
<version>${mavenVersion}</version>
168+
<scope>provided</scope>
169+
</dependency>
164170
<dependency>
165171
<groupId>org.apache.maven</groupId>
166172
<artifactId>maven-plugin-api</artifactId>

0 commit comments

Comments
 (0)