Skip to content

Commit 71bc1ff

Browse files
michael-omichael-o
committed
[MPMD-377] Upgrade plugins and components (in ITs)
1 parent d96baba commit 71bc1ff

File tree

4 files changed

+89
-89
lines changed

4 files changed

+89
-89
lines changed

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ under the License.
170170
<dependency>
171171
<groupId>org.codehaus.plexus</groupId>
172172
<artifactId>plexus-utils</artifactId>
173-
<version>3.4.2</version>
173+
<version>3.5.1</version>
174174
</dependency>
175175
<dependency>
176176
<groupId>org.codehaus.plexus</groupId>
@@ -269,7 +269,7 @@ under the License.
269269
<dependency>
270270
<groupId>org.apache.maven.wagon</groupId>
271271
<artifactId>wagon-http-lightweight</artifactId>
272-
<version>3.5.1</version>
272+
<version>3.5.3</version>
273273
<scope>test</scope>
274274
</dependency>
275275
<dependency>

‎src/it/MCHECKSTYLE-219-no-license_success/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</properties>
3333

3434
<description>
35-
The default configLocation (i.e. sun_checks.xml ) doesn't check for headers, so it doesn't matter if the LICENSE.txt couldn't be found.
35+
The default configLocation (i.e. sun_checks.xml) doesn't check for headers, so it doesn't matter if the LICENSE.txt couldn't be found.
3636
</description>
3737

3838
<build>

‎src/it/MCHECKSTYLE-70-multi-sourcefolder/pom.xml‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
~ Licensed to the Apache Software Foundation (ASF) under one
4-
~ or more contributor license agreements. See the NOTICE file
5-
~ distributed with this work for additional information
6-
~ regarding copyright ownership. The ASF licenses this file
7-
~ to you under the Apache License, Version 2.0 (the
8-
~ "License"); you may not use this file except in compliance
9-
~ with the License. You may obtain a copy of the License at
10-
~
11-
~ http://www.apache.org/licenses/LICENSE-2.0
12-
~
13-
~ Unless required by applicable law or agreed to in writing,
14-
~ software distributed under the License is distributed on an
15-
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
~ KIND, either express or implied. See the License for the
17-
~ specific language governing permissions and limitations
18-
~ under the License.
19-
-->
20-
21-
<project xmlns="http://maven.apache.org/POM/4.0.0"
22-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24-
<modelVersion>4.0.0</modelVersion>
25-
26-
<groupId>org.apache.maven.plugins.checkstyle</groupId>
27-
<artifactId>multi-sourcefolder</artifactId>
28-
<version>1.0-SNAPSHOT</version>
29-
30-
<url>https://issues.apache.org/jira/browse/MCHECKSTYLE-70</url>
31-
32-
<properties>
33-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34-
</properties>
35-
36-
<build>
37-
<plugins>
38-
<plugin>
39-
<groupId>org.codehaus.mojo</groupId>
40-
<artifactId>build-helper-maven-plugin</artifactId>
41-
<version>1.7</version>
42-
<executions>
43-
<execution>
44-
<id>main-source</id>
45-
<goals>
46-
<goal>add-source</goal>
47-
</goals>
48-
<configuration>
49-
<sources>
50-
<source>src/additional/java</source>
51-
</sources>
52-
</configuration>
53-
</execution>
54-
<execution>
55-
<id>test-source</id>
56-
<goals>
57-
<goal>add-test-source</goal>
58-
</goals>
59-
<configuration>
60-
<sources>
61-
<source>src/test-additional/java</source>
62-
</sources>
63-
</configuration>
64-
</execution>
65-
</executions>
66-
</plugin>
67-
<plugin>
68-
<groupId>org.apache.maven.plugins</groupId>
69-
<artifactId>maven-checkstyle-plugin</artifactId>
70-
<version>@project.version@</version>
71-
<executions>
72-
<execution>
73-
<id>check</id>
74-
<goals>
75-
<goal>check</goal>
76-
</goals>
77-
<configuration>
78-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
79-
</configuration>
80-
</execution>
81-
</executions>
82-
</plugin>
83-
</plugins>
84-
</build>
85-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one
4+
~ or more contributor license agreements. See the NOTICE file
5+
~ distributed with this work for additional information
6+
~ regarding copyright ownership. The ASF licenses this file
7+
~ to you under the Apache License, Version 2.0 (the
8+
~ "License"); you may not use this file except in compliance
9+
~ with the License. You may obtain a copy of the License at
10+
~
11+
~ http://www.apache.org/licenses/LICENSE-2.0
12+
~
13+
~ Unless required by applicable law or agreed to in writing,
14+
~ software distributed under the License is distributed on an
15+
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
~ KIND, either express or implied. See the License for the
17+
~ specific language governing permissions and limitations
18+
~ under the License.
19+
-->
20+
21+
<project xmlns="http://maven.apache.org/POM/4.0.0"
22+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24+
<modelVersion>4.0.0</modelVersion>
25+
26+
<groupId>org.apache.maven.plugins.checkstyle</groupId>
27+
<artifactId>multi-sourcefolder</artifactId>
28+
<version>1.0-SNAPSHOT</version>
29+
30+
<url>https://issues.apache.org/jira/browse/MCHECKSTYLE-70</url>
31+
32+
<properties>
33+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34+
</properties>
35+
36+
<build>
37+
<plugins>
38+
<plugin>
39+
<groupId>org.codehaus.mojo</groupId>
40+
<artifactId>build-helper-maven-plugin</artifactId>
41+
<version>3.4.0</version>
42+
<executions>
43+
<execution>
44+
<id>main-source</id>
45+
<goals>
46+
<goal>add-source</goal>
47+
</goals>
48+
<configuration>
49+
<sources>
50+
<source>src/additional/java</source>
51+
</sources>
52+
</configuration>
53+
</execution>
54+
<execution>
55+
<id>test-source</id>
56+
<goals>
57+
<goal>add-test-source</goal>
58+
</goals>
59+
<configuration>
60+
<sources>
61+
<source>src/test-additional/java</source>
62+
</sources>
63+
</configuration>
64+
</execution>
65+
</executions>
66+
</plugin>
67+
<plugin>
68+
<groupId>org.apache.maven.plugins</groupId>
69+
<artifactId>maven-checkstyle-plugin</artifactId>
70+
<version>@project.version@</version>
71+
<executions>
72+
<execution>
73+
<id>check</id>
74+
<goals>
75+
<goal>check</goal>
76+
</goals>
77+
<configuration>
78+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
79+
</configuration>
80+
</execution>
81+
</executions>
82+
</plugin>
83+
</plugins>
84+
</build>
85+
</project>

‎src/it/check-pass/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<plugin>
4141
<groupId>org.apache.maven.plugins</groupId>
4242
<artifactId>maven-compiler-plugin</artifactId>
43-
<version>3.1</version>
43+
<version>3.11.0</version>
4444
</plugin>
4545
<plugin>
4646
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)