Skip to content

Commit 354ead0

Browse files
cstamascstamas
committed
Consolidate dependencies
No dependency version should exist aside of the top level POM.
1 parent 2e00215 commit 354ead0

File tree

4 files changed

+146
-43
lines changed

4 files changed

+146
-43
lines changed

‎org.eclipse.sisu.inject/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<dependency>
3131
<groupId>com.google.inject</groupId>
3232
<artifactId>guice</artifactId>
33-
<version>4.0</version>
3433
<scope>provided</scope>
3534
</dependency>
3635

@@ -40,49 +39,42 @@
4039
<dependency>
4140
<groupId>org.slf4j</groupId>
4241
<artifactId>slf4j-api</artifactId>
43-
<version>1.7.36</version>
4442
<scope>provided</scope>
4543
<optional>true</optional>
4644
</dependency>
4745
<dependency>
4846
<groupId>org.osgi</groupId>
4947
<artifactId>osgi.core</artifactId>
50-
<version>5.0.0</version>
5148
<scope>provided</scope>
5249
<optional>true</optional>
5350
</dependency>
5451
<dependency>
5552
<groupId>javax.annotation</groupId>
5653
<artifactId>javax.annotation-api</artifactId>
57-
<version>1.2</version>
5854
<scope>provided</scope>
5955
<optional>true</optional>
6056
</dependency>
6157
<dependency>
6258
<groupId>javax.enterprise</groupId>
6359
<artifactId>cdi-api</artifactId>
64-
<version>1.2</version>
6560
<scope>provided</scope>
6661
<optional>true</optional>
6762
</dependency>
6863
<dependency>
6964
<groupId>javax.servlet</groupId>
7065
<artifactId>servlet-api</artifactId>
71-
<version>2.5</version>
7266
<scope>provided</scope>
7367
<optional>true</optional>
7468
</dependency>
7569
<dependency>
7670
<groupId>com.google.inject.extensions</groupId>
7771
<artifactId>guice-servlet</artifactId>
78-
<version>4.0</version>
7972
<scope>provided</scope>
8073
<optional>true</optional>
8174
</dependency>
8275
<dependency>
8376
<groupId>junit</groupId>
8477
<artifactId>junit</artifactId>
85-
<version>4.13.2</version><!-- older version not supported by junit-vintage runner -->
8678
<scope>provided</scope>
8779
<optional>true</optional>
8880
</dependency>
@@ -96,26 +88,22 @@
9688
<dependency>
9789
<groupId>org.testng</groupId>
9890
<artifactId>testng</artifactId>
99-
<version>6.7</version>
10091
<scope>provided</scope>
10192
<optional>true</optional>
10293
</dependency>
10394
<dependency>
10495
<groupId>ch.qos.logback</groupId>
10596
<artifactId>logback-classic</artifactId>
106-
<version>1.2.13</version>
10797
<scope>test</scope>
10898
</dependency>
10999
<dependency>
110100
<groupId>com.google.inject.extensions</groupId>
111101
<artifactId>guice-assistedinject</artifactId>
112-
<version>4.0</version>
113102
<scope>test</scope>
114103
</dependency>
115104
<dependency>
116105
<groupId>org.apache.felix</groupId>
117106
<artifactId>org.apache.felix.framework</artifactId>
118-
<version>7.0.5</version>
119107
<scope>test</scope>
120108
</dependency>
121109
</dependencies>

‎org.eclipse.sisu.mojos/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,13 @@
3636
<dependency>
3737
<groupId>org.eclipse.sisu</groupId>
3838
<artifactId>org.eclipse.sisu.inject</artifactId>
39-
<version>${project.version}</version>
4039
</dependency>
4140
<!--
4241
| Avoid internal log spam; use -Dsisu.debug to get detailed logging
4342
-->
4443
<dependency>
4544
<groupId>org.slf4j</groupId>
4645
<artifactId>slf4j-nop</artifactId>
47-
<version>1.6.4</version>
4846
</dependency>
4947
<!--
5048
| Maven APIs and components used to analyze the project dependencies
@@ -76,30 +74,24 @@
7674
<dependency>
7775
<groupId>org.apache.maven.plugin-tools</groupId>
7876
<artifactId>maven-plugin-annotations</artifactId>
79-
<version>${mavenPluginToolsVersion}</version>
8077
<scope>provided</scope>
8178
</dependency>
8279
<dependency>
8380
<groupId>org.apache.maven.shared</groupId>
8481
<artifactId>maven-common-artifact-filters</artifactId>
85-
<version>3.3.2</version>
8682
</dependency>
8783
<dependency>
8884
<groupId>org.codehaus.plexus</groupId>
8985
<artifactId>plexus-utils</artifactId>
90-
<version>3.5.1</version>
9186
</dependency>
9287
<!-- incremental build support (http://www.eclipse.org/m2e/documentation/m2e-making-maven-plugins-compat.html) -->
9388
<dependency>
9489
<groupId>org.sonatype.plexus</groupId>
9590
<artifactId>plexus-build-api</artifactId>
96-
<version>0.0.7</version>
97-
<scope>compile</scope>
9891
</dependency>
9992
<dependency>
10093
<groupId>junit</groupId>
10194
<artifactId>junit</artifactId>
102-
<version>4.13.2</version>
10395
<scope>test</scope>
10496
</dependency>
10597
</dependencies>

‎org.eclipse.sisu.plexus/pom.xml

+1-23
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<dependency>
3131
<groupId>com.google.inject</groupId>
3232
<artifactId>guice</artifactId>
33-
<version>4.0</version>
3433
<scope>provided</scope>
3534
</dependency>
3635
<!--
@@ -40,7 +39,6 @@
4039
<dependency>
4140
<groupId>javax.annotation</groupId>
4241
<artifactId>javax.annotation-api</artifactId>
43-
<version>1.2</version>
4442
<scope>provided</scope>
4543
<optional>true</optional>
4644
</dependency>
@@ -51,75 +49,55 @@
5149
<dependency>
5250
<groupId>javax.enterprise</groupId>
5351
<artifactId>cdi-api</artifactId>
54-
<version>1.2</version>
5552
<scope>provided</scope>
5653
<optional>true</optional>
57-
<exclusions>
58-
<exclusion>
59-
<groupId>javax.el</groupId>
60-
<artifactId>javax.el-api</artifactId>
61-
</exclusion>
62-
<exclusion>
63-
<groupId>javax.interceptor</groupId>
64-
<artifactId>javax.interceptor-api</artifactId>
65-
</exclusion>
66-
</exclusions>
6754
</dependency>
55+
6856
<dependency>
6957
<groupId>org.eclipse.sisu</groupId>
7058
<artifactId>org.eclipse.sisu.inject</artifactId>
71-
<version>${project.version}</version>
7259
</dependency>
7360
<!--
7461
| Plexus classloading/utilities
7562
-->
7663
<dependency>
7764
<groupId>org.codehaus.plexus</groupId>
7865
<artifactId>plexus-component-annotations</artifactId>
79-
<version>2.1.0</version>
8066
</dependency>
8167
<dependency>
8268
<groupId>org.codehaus.plexus</groupId>
8369
<artifactId>plexus-classworlds</artifactId>
84-
<version>2.6.0</version>
8570
</dependency>
8671
<dependency>
8772
<groupId>org.codehaus.plexus</groupId>
8873
<artifactId>plexus-utils</artifactId>
89-
<version>4.0.1</version>
9074
</dependency>
9175
<dependency>
9276
<groupId>org.codehaus.plexus</groupId>
9377
<artifactId>plexus-xml</artifactId>
94-
<!-- keep 3.x to be compatible with Maven 3 -->
95-
<version>3.0.0</version>
9678
</dependency>
9779

9880
<dependency>
9981
<groupId>org.slf4j</groupId>
10082
<artifactId>slf4j-api</artifactId>
101-
<version>1.7.36</version>
10283
<scope>provided</scope>
10384
<optional>true</optional>
10485
</dependency>
10586
<dependency>
10687
<groupId>org.osgi</groupId>
10788
<artifactId>osgi.core</artifactId>
108-
<version>5.0.0</version>
10989
<scope>provided</scope>
11090
<optional>true</optional>
11191
</dependency>
11292
<dependency>
11393
<groupId>junit</groupId>
11494
<artifactId>junit</artifactId>
115-
<version>4.13.2</version>
11695
<scope>provided</scope>
11796
<optional>true</optional>
11897
</dependency>
11998
<dependency>
12099
<groupId>ch.qos.logback</groupId>
121100
<artifactId>logback-classic</artifactId>
122-
<version>1.2.13</version>
123101
<scope>test</scope>
124102
</dependency>
125103
</dependencies>

‎pom.xml

+145
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,151 @@
133133

134134
<dependencyManagement>
135135
<dependencies>
136+
137+
<!--
138+
| Internal modules (reactor)
139+
-->
140+
<dependency>
141+
<groupId>org.eclipse.sisu</groupId>
142+
<artifactId>org.eclipse.sisu.inject</artifactId>
143+
<version>${project.version}</version>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.eclipse.sisu</groupId>
147+
<artifactId>org.eclipse.sisu.plexus</artifactId>
148+
<version>${project.version}</version>
149+
</dependency>
150+
151+
<!--
152+
| Sisu is compatible with Guice 3.0+
153+
-->
154+
<dependency>
155+
<groupId>com.google.inject</groupId>
156+
<artifactId>guice</artifactId>
157+
<version>4.0</version>
158+
</dependency>
159+
160+
<!--
161+
| Plexus classloading/utilities
162+
-->
163+
<dependency>
164+
<groupId>org.codehaus.plexus</groupId>
165+
<artifactId>plexus-component-annotations</artifactId>
166+
<version>2.1.0</version>
167+
</dependency>
168+
<dependency>
169+
<groupId>org.codehaus.plexus</groupId>
170+
<artifactId>plexus-classworlds</artifactId>
171+
<version>2.6.0</version>
172+
</dependency>
173+
<dependency>
174+
<groupId>org.codehaus.plexus</groupId>
175+
<artifactId>plexus-utils</artifactId>
176+
<version>3.5.1</version>
177+
</dependency>
178+
<dependency>
179+
<groupId>org.codehaus.plexus</groupId>
180+
<artifactId>plexus-xml</artifactId>
181+
<!-- keep 3.x to be compatible with Maven 3 -->
182+
<version>3.0.0</version>
183+
</dependency>
184+
185+
<!--
186+
| Optional support dependencies
187+
-->
188+
<dependency>
189+
<groupId>org.slf4j</groupId>
190+
<artifactId>slf4j-api</artifactId>
191+
<version>1.7.36</version>
192+
</dependency>
193+
<dependency>
194+
<groupId>org.slf4j</groupId>
195+
<artifactId>slf4j-nop</artifactId>
196+
<version>1.7.36</version>
197+
</dependency>
198+
<dependency>
199+
<groupId>org.osgi</groupId>
200+
<artifactId>osgi.core</artifactId>
201+
<version>5.0.0</version>
202+
</dependency>
203+
<dependency>
204+
<groupId>javax.annotation</groupId>
205+
<artifactId>javax.annotation-api</artifactId>
206+
<version>1.2</version>
207+
</dependency>
208+
<dependency>
209+
<groupId>javax.enterprise</groupId>
210+
<artifactId>cdi-api</artifactId>
211+
<version>1.2</version>
212+
<exclusions>
213+
<exclusion>
214+
<groupId>javax.el</groupId>
215+
<artifactId>javax.el-api</artifactId>
216+
</exclusion>
217+
<exclusion>
218+
<groupId>javax.interceptor</groupId>
219+
<artifactId>javax.interceptor-api</artifactId>
220+
</exclusion>
221+
</exclusions>
222+
</dependency>
223+
<dependency>
224+
<groupId>javax.servlet</groupId>
225+
<artifactId>servlet-api</artifactId>
226+
<version>2.5</version>
227+
</dependency>
228+
<dependency>
229+
<groupId>com.google.inject.extensions</groupId>
230+
<artifactId>guice-servlet</artifactId>
231+
<version>4.0</version>
232+
</dependency>
233+
<dependency>
234+
<groupId>junit</groupId>
235+
<artifactId>junit</artifactId>
236+
<version>4.13.2</version><!-- older version not supported by junit-vintage runner -->
237+
</dependency>
238+
<dependency>
239+
<groupId>org.testng</groupId>
240+
<artifactId>testng</artifactId>
241+
<version>6.7</version>
242+
</dependency>
243+
<dependency>
244+
<groupId>ch.qos.logback</groupId>
245+
<artifactId>logback-classic</artifactId>
246+
<version>1.2.13</version>
247+
</dependency>
248+
<dependency>
249+
<groupId>com.google.inject.extensions</groupId>
250+
<artifactId>guice-assistedinject</artifactId>
251+
<version>4.0</version>
252+
</dependency>
253+
<dependency>
254+
<groupId>org.apache.felix</groupId>
255+
<artifactId>org.apache.felix.framework</artifactId>
256+
<version>7.0.5</version>
257+
</dependency>
258+
<dependency>
259+
<groupId>org.sonatype.plexus</groupId>
260+
<artifactId>plexus-build-api</artifactId>
261+
<version>0.0.7</version>
262+
</dependency>
263+
264+
<!--
265+
| org.eclipse.sisu.mojos specific
266+
-->
267+
<dependency>
268+
<groupId>org.apache.maven.plugin-tools</groupId>
269+
<artifactId>maven-plugin-annotations</artifactId>
270+
<version>${mavenPluginToolsVersion}</version>
271+
</dependency>
272+
<dependency>
273+
<groupId>org.apache.maven.shared</groupId>
274+
<artifactId>maven-common-artifact-filters</artifactId>
275+
<version>3.3.2</version>
276+
</dependency>
277+
278+
<!--
279+
| Testing
280+
-->
136281
<dependency>
137282
<groupId>org.junit</groupId>
138283
<artifactId>junit-bom</artifactId>

0 commit comments

Comments
 (0)