Skip to content

Commit 45c1e3f

Browse files
mbienmbien
authored
Merge pull request #244 from cstamas/cleanup-deps
Cleanup deps
2 parents 86313c3 + f89f395 commit 45c1e3f

File tree

6 files changed

+352
-291
lines changed

6 files changed

+352
-291
lines changed

‎nb-repository-plugin/pom.xml

Lines changed: 27 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ under the License.
3737
<inceptionYear>2005</inceptionYear>
3838

3939
<prerequisites>
40-
<maven>3.2.5</maven>
40+
<maven>[3.8,)</maven>
4141
</prerequisites>
4242

4343
<!--profiles>
@@ -60,78 +60,66 @@ under the License.
6060
</profile>
6161
</profiles-->
6262
<dependencies>
63+
<dependency>
64+
<groupId>org.codehaus.plexus</groupId>
65+
<artifactId>plexus-utils</artifactId>
66+
</dependency>
67+
<dependency>
68+
<groupId>org.apache.ant</groupId>
69+
<artifactId>ant</artifactId>
70+
</dependency>
71+
6372
<dependency>
6473
<groupId>org.apache.maven</groupId>
6574
<artifactId>maven-plugin-api</artifactId>
66-
<version>${maven.version}</version>
6775
<scope>provided</scope>
6876
</dependency>
6977
<dependency>
7078
<groupId>org.apache.maven.plugin-tools</groupId>
7179
<artifactId>maven-plugin-annotations</artifactId>
72-
<scope>compile</scope>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.codehaus.plexus</groupId>
76-
<artifactId>plexus-utils</artifactId>
77-
</dependency>
78-
<dependency>
79-
<groupId>org.codehaus.plexus</groupId>
80-
<artifactId>plexus-xml</artifactId>
81-
</dependency>
82-
<dependency>
83-
<groupId>junit</groupId>
84-
<artifactId>junit</artifactId>
85-
<scope>test</scope>
80+
<scope>provided</scope>
8681
</dependency>
8782
<dependency>
8883
<groupId>org.apache.maven</groupId>
8984
<artifactId>maven-model</artifactId>
90-
<version>${maven.version}</version>
9185
<scope>provided</scope>
9286
</dependency>
9387
<dependency>
9488
<groupId>org.apache.maven</groupId>
9589
<artifactId>maven-core</artifactId>
96-
<version>${maven.version}</version>
9790
<scope>provided</scope>
9891
</dependency>
9992
<dependency>
10093
<groupId>javax.inject</groupId>
10194
<artifactId>javax.inject</artifactId>
102-
<version>${javax.inject.version}</version>
10395
<scope>provided</scope>
10496
</dependency>
97+
98+
<dependency>
99+
<groupId>junit</groupId>
100+
<artifactId>junit</artifactId>
101+
<scope>test</scope>
102+
</dependency>
105103
<dependency>
106104
<groupId>org.apache.maven</groupId>
107105
<artifactId>maven-compat</artifactId>
108-
<version>${maven.version}</version>
109106
<scope>test</scope>
110107
</dependency>
111108
<dependency>
112109
<groupId>org.apache.maven.plugin-testing</groupId>
113110
<artifactId>maven-plugin-testing-harness</artifactId>
114-
<version>3.3.0</version>
115111
<scope>test</scope>
116112
</dependency>
117113
<dependency>
118114
<groupId>org.slf4j</groupId>
119115
<artifactId>slf4j-simple</artifactId>
120-
<version>2.0.17</version>
121116
<scope>test</scope>
122117
</dependency>
123118
<dependency>
124119
<groupId>org.mockito</groupId>
125120
<artifactId>mockito-core</artifactId>
126-
<version>${mockito.version}</version>
127121
<scope>test</scope>
128122
</dependency>
129-
<dependency>
130-
<groupId>org.apache.ant</groupId>
131-
<artifactId>ant</artifactId>
132-
<type>jar</type>
133-
<scope>compile</scope>
134-
</dependency>
135123
<dependency>
136124
<groupId>${project.groupId}</groupId>
137125
<artifactId>nb-shared</artifactId>
@@ -142,25 +130,8 @@ under the License.
142130
<!-- TODO need to override parent version value... I suppose this will eventually end up in mojo parent pom, check regularly -->
143131
<build>
144132
<plugins>
145-
<plugin>
146-
<artifactId>maven-enforcer-plugin</artifactId>
147-
<executions>
148-
<execution>
149-
<id>enforce-maven</id>
150-
<goals>
151-
<goal>enforce</goal>
152-
</goals>
153-
<configuration>
154-
<rules>
155-
<requireMavenVersion>
156-
<version>${maven.minimum.version}</version>
157-
</requireMavenVersion>
158-
</rules>
159-
</configuration>
160-
</execution>
161-
</executions>
162-
</plugin>
163133
<plugin><!-- TODO need to override parent version value... I suppose this will eventually end up in mojo parent pom, check regularly -->
134+
<groupId>org.apache.maven.plugins</groupId>
164135
<artifactId>maven-plugin-plugin</artifactId>
165136
<configuration>
166137
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -183,31 +154,14 @@ under the License.
183154
</executions>
184155
</plugin>
185156
<plugin>
157+
<groupId>org.apache.maven.plugins</groupId>
186158
<artifactId>maven-compiler-plugin</artifactId>
187159
<configuration>
188160
<showDeprecation>true</showDeprecation>
189161
</configuration>
190162
</plugin>
191163
<plugin>
192-
<groupId>org.codehaus.mojo</groupId>
193-
<artifactId>animal-sniffer-maven-plugin</artifactId>
194-
<executions>
195-
<execution>
196-
<phase>package</phase>
197-
<goals>
198-
<goal>check</goal>
199-
</goals>
200-
<configuration>
201-
<signature>
202-
<groupId>org.codehaus.mojo.signature</groupId>
203-
<artifactId>java18</artifactId>
204-
<version>1.0</version>
205-
</signature>
206-
</configuration>
207-
</execution>
208-
</executions>
209-
</plugin>
210-
<plugin>
164+
<groupId>org.apache.maven.plugins</groupId>
211165
<artifactId>maven-site-plugin</artifactId>
212166
</plugin>
213167
</plugins>
@@ -216,6 +170,7 @@ under the License.
216170
<reporting>
217171
<plugins>
218172
<plugin>
173+
<groupId>org.apache.maven.plugins</groupId>
219174
<artifactId>maven-project-info-reports-plugin</artifactId>
220175
<reportSets>
221176
<reportSet>
@@ -227,15 +182,19 @@ under the License.
227182
</reportSets>
228183
</plugin>
229184
<plugin>
185+
<groupId>org.apache.maven.plugins</groupId>
230186
<artifactId>maven-checkstyle-plugin</artifactId>
231187
</plugin>
232188
<plugin>
189+
<groupId>org.apache.maven.plugins</groupId>
233190
<artifactId>maven-jxr-plugin</artifactId>
234191
</plugin>
235192
<plugin>
193+
<groupId>org.apache.maven.plugins</groupId>
236194
<artifactId>maven-plugin-report-plugin</artifactId>
237195
</plugin>
238196
<plugin>
197+
<groupId>org.apache.maven.plugins</groupId>
239198
<artifactId>maven-javadoc-plugin</artifactId>
240199
<configuration>
241200
<quiet>true</quiet>
@@ -260,6 +219,7 @@ under the License.
260219
</configuration>
261220
</plugin>
262221
<plugin>
222+
<groupId>org.apache.maven.plugins</groupId>
263223
<artifactId>maven-pmd-plugin</artifactId>
264224
</plugin>
265225
<plugin>
@@ -280,6 +240,7 @@ under the License.
280240

281241
<plugins>
282242
<plugin>
243+
<groupId>org.apache.maven.plugins</groupId>
283244
<artifactId>maven-invoker-plugin</artifactId>
284245
<configuration>
285246
<debug>false</debug>

‎nb-shared/pom.xml

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -64,61 +64,31 @@ under the License.
6464
<dependency>
6565
<groupId>org.apache.maven</groupId>
6666
<artifactId>maven-plugin-api</artifactId>
67-
<version>${maven.version}</version>
6867
</dependency>
68+
<dependency>
69+
<groupId>org.apache.ant</groupId>
70+
<artifactId>ant</artifactId>
71+
</dependency>
72+
6973
<dependency>
7074
<groupId>junit</groupId>
7175
<artifactId>junit</artifactId>
7276
<scope>test</scope>
7377
</dependency>
74-
<dependency>
75-
<groupId>org.apache.ant</groupId>
76-
<artifactId>ant</artifactId>
77-
<type>jar</type>
78-
<scope>compile</scope>
79-
</dependency>
8078
</dependencies>
8179

82-
<build>
83-
<plugins>
84-
<plugin>
85-
<artifactId>maven-compiler-plugin</artifactId>
86-
</plugin>
87-
<plugin>
88-
<groupId>org.codehaus.mojo</groupId>
89-
<artifactId>animal-sniffer-maven-plugin</artifactId>
90-
<executions>
91-
<execution>
92-
<phase>package</phase>
93-
<goals>
94-
<goal>check</goal>
95-
</goals>
96-
<configuration>
97-
<signature>
98-
<groupId>org.codehaus.mojo.signature</groupId>
99-
<artifactId>java18</artifactId>
100-
<version>1.0</version>
101-
</signature>
102-
</configuration>
103-
</execution>
104-
</executions>
105-
</plugin>
106-
<plugin>
107-
<artifactId>maven-site-plugin</artifactId>
108-
</plugin>
109-
</plugins>
110-
</build>
111-
11280
<reporting>
11381
<plugins>
11482
<plugin>
11583
<groupId>org.apache.maven.plugins</groupId>
11684
<artifactId>maven-project-info-reports-plugin</artifactId>
11785
</plugin>
11886
<plugin>
87+
<groupId>org.apache.maven.plugins</groupId>
11988
<artifactId>maven-checkstyle-plugin</artifactId>
12089
</plugin>
12190
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
12292
<artifactId>maven-javadoc-plugin</artifactId>
12393
<configuration>
12494
<quiet>true</quiet>
@@ -142,9 +112,11 @@ under the License.
142112
</configuration>
143113
</plugin>
144114
<plugin>
115+
<groupId>org.apache.maven.plugins</groupId>
145116
<artifactId>maven-jxr-plugin</artifactId>
146117
</plugin>
147118
<plugin>
119+
<groupId>org.apache.maven.plugins</groupId>
148120
<artifactId>maven-pmd-plugin</artifactId>
149121
</plugin>
150122
<plugin>

‎nbm-maven-harness/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ under the License.
3535
<build>
3636
<plugins>
3737
<plugin>
38+
<groupId>org.apache.maven.plugins</groupId>
3839
<artifactId>maven-dependency-plugin</artifactId>
3940
<executions>
4041
<execution>
@@ -59,6 +60,7 @@ under the License.
5960
</executions>
6061
</plugin>
6162
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
6264
<artifactId>maven-antrun-plugin</artifactId>
6365
<executions>
6466
<execution>
@@ -94,6 +96,7 @@ under the License.
9496
</plugin>
9597
<!-- No real effect on the build, but prevents NB IDE from thinking src/main/java should be considered in preference to the JAR: -->
9698
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
97100
<artifactId>maven-shade-plugin</artifactId>
98101
<executions>
99102
<execution>
@@ -109,6 +112,7 @@ under the License.
109112
<reporting>
110113
<plugins>
111114
<plugin>
115+
<groupId>org.apache.maven.plugins</groupId>
112116
<artifactId>maven-project-info-reports-plugin</artifactId>
113117
<reportSets>
114118
<reportSet>

0 commit comments

Comments
 (0)