Skip to content

Commit e75f84d

Browse files
michael-omichael-o
committed
Prepare for Doxia 2.0.0
1 parent b72b1f6 commit e75f84d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+204
-952
lines changed

‎pom.xml

Lines changed: 11 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ under the License.
3030
</parent>
3131

3232
<artifactId>maven-checkstyle-plugin</artifactId>
33-
<version>3.2.3-SNAPSHOT</version>
33+
<version>4.0.0-M1-SNAPSHOT</version>
3434
<packaging>maven-plugin</packaging>
3535

3636
<name>Apache Maven Checkstyle Plugin</name>
@@ -67,10 +67,10 @@ under the License.
6767
<aetherVersion>1.0.0.v20140518</aetherVersion>
6868
<mavenVersion>3.2.5</mavenVersion>
6969
<checkstyleVersion>9.3</checkstyleVersion>
70-
<doxiaVersion>1.11.1</doxiaVersion>
71-
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
72-
<sitePluginVersion>3.12.1</sitePluginVersion>
73-
<jxrPluginVersion>3.3.0</jxrPluginVersion>
70+
<doxiaVersion>2.0.0-M6</doxiaVersion>
71+
<doxiaSitetoolsVersion>2.0.0-M10</doxiaSitetoolsVersion>
72+
<sitePluginVersion>4.0.0-M8</sitePluginVersion>
73+
<jxrPluginVersion>4.0.0-M1-SNAPSHOT</jxrPluginVersion>
7474
<project.build.outputTimestamp>2023-04-18T14:54:00Z</project.build.outputTimestamp>
7575
</properties>
7676

@@ -122,12 +122,12 @@ under the License.
122122
<dependency>
123123
<groupId>org.apache.maven.reporting</groupId>
124124
<artifactId>maven-reporting-api</artifactId>
125-
<version>3.1.1</version>
125+
<version>4.0.0-M6</version>
126126
</dependency>
127127
<dependency>
128128
<groupId>org.apache.maven.reporting</groupId>
129129
<artifactId>maven-reporting-impl</artifactId>
130-
<version>3.2.0</version>
130+
<version>4.0.0-M8</version>
131131
</dependency>
132132

133133
<!-- doxia -->
@@ -166,42 +166,15 @@ under the License.
166166
<dependency>
167167
<groupId>org.codehaus.plexus</groupId>
168168
<artifactId>plexus-utils</artifactId>
169-
<version>3.4.2</version>
170-
</dependency>
171-
<dependency>
172-
<groupId>org.codehaus.plexus</groupId>
173-
<artifactId>plexus-velocity</artifactId>
174-
<version>1.2</version>
175-
<exclusions>
176-
<exclusion>
177-
<groupId>org.codehaus.plexus</groupId>
178-
<artifactId>plexus-container-default</artifactId>
179-
</exclusion>
180-
<exclusion>
181-
<groupId>org.codehaus.plexus</groupId>
182-
<artifactId>plexus-component-api</artifactId>
183-
</exclusion>
184-
<exclusion>
185-
<groupId>velocity</groupId>
186-
<artifactId>velocity</artifactId>
187-
</exclusion>
188-
</exclusions>
169+
<version>3.5.1</version>
189170
</dependency>
190-
191171
<!-- checkstyle -->
192172
<dependency>
193173
<groupId>com.puppycrawl.tools</groupId>
194174
<artifactId>checkstyle</artifactId>
195175
<version>${checkstyleVersion}</version>
196176
</dependency>
197177

198-
<!-- misc -->
199-
<dependency>
200-
<groupId>org.apache.velocity</groupId>
201-
<artifactId>velocity</artifactId>
202-
<version>1.7</version>
203-
</dependency>
204-
205178
<!-- test -->
206179
<dependency>
207180
<groupId>org.codehaus.plexus</groupId>
@@ -260,7 +233,7 @@ under the License.
260233
<dependency>
261234
<groupId>org.apache.maven.wagon</groupId>
262235
<artifactId>wagon-http-lightweight</artifactId>
263-
<version>3.5.1</version>
236+
<version>3.5.3</version>
264237
<scope>test</scope>
265238
</dependency>
266239
<dependency>
@@ -297,7 +270,7 @@ under the License.
297270
<plugin>
298271
<!-- check with parent pom upgrade -->
299272
<artifactId>maven-checkstyle-plugin</artifactId>
300-
<version>3.1.1</version>
273+
<version>3.2.1</version>
301274
<dependencies>
302275
<dependency>
303276
<groupId>com.puppycrawl.tools</groupId>
@@ -307,7 +280,7 @@ under the License.
307280
<dependency>
308281
<groupId>org.apache.maven.shared</groupId>
309282
<artifactId>maven-shared-resources</artifactId>
310-
<version>4</version>
283+
<version>5</version>
311284
</dependency>
312285
</dependencies>
313286
</plugin>

‎src/it/MCHECKSTYLE-357-with-header-override/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,6 @@
187187
<plugins>
188188
<plugin>
189189
<artifactId>maven-checkstyle-plugin</artifactId>
190-
<configuration>
191-
<enableRSS>true</enableRSS>
192-
</configuration>
193190
<reportSets>
194191
<reportSet>
195192
<reports>

‎src/it/MCHECKSTYLE-357-with-header-override/verify.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,4 @@ assert new File(basedir, 'target/checkstyle-checker.xml').exists();
2424
assert new File(basedir, 'target/checkstyle-result.xml').exists();
2525
assert new File(basedir, 'target/checkstyle-rules.xml').exists();
2626

27-
File rssFile = new File( basedir, 'target/site/checkstyle.rss' );
28-
assert rssFile.exists();
29-
3027
return true;

‎src/it/MCHECKSTYLE-357/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,6 @@
172172
<plugins>
173173
<plugin>
174174
<artifactId>maven-checkstyle-plugin</artifactId>
175-
<configuration>
176-
<enableRSS>true</enableRSS>
177-
</configuration>
178175
<reportSets>
179176
<reportSet>
180177
<reports>

‎src/it/MCHECKSTYLE-357/verify.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,4 @@ assert new File(basedir, 'target/checkstyle-checker.xml').exists();
2424
assert new File(basedir, 'target/checkstyle-result.xml').exists();
2525
assert new File(basedir, 'target/checkstyle-rules.xml').exists();
2626

27-
File rssFile = new File( basedir, 'target/site/checkstyle.rss' );
28-
assert rssFile.exists();
29-
3027
return true;

‎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.3.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>

‎src/it/checkstyle-goal/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
<groupId>org.apache.maven.plugins</groupId>
4242
<artifactId>maven-checkstyle-plugin</artifactId>
4343
<version>@project.version@</version>
44-
<configuration>
45-
<enableRSS>true</enableRSS>
46-
</configuration>
4744
</plugin>
4845
</plugins>
4946
</build>

‎src/it/checkstyle-goal/verify.groovy

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,7 @@ assert new File( basedir, 'target/checkstyle-checker.xml' ).exists();
2424
assert new File( basedir, 'target/checkstyle-header.txt' ).exists();
2525
assert new File( basedir, 'target/checkstyle-result.xml' ).exists();
2626

27-
File rssFile = new File( basedir, 'target/site/checkstyle.rss' );
28-
assert rssFile.exists();
29-
30-
def rss = new XmlParser().parse( rssFile );
31-
32-
def channel = rss.channel[0]
33-
34-
assert channel.title.text() == 'check-pass - Checkstyle report'
35-
36-
def item = channel.item[0]
37-
assert item != null
38-
assert item.title.text().startsWith('File: 1,')
39-
4027
def html = new File( basedir, 'target/site/checkstyle.html' ).text;
4128
assert html.contains( '<meta charset="UTF-8" />' );
4229

43-
return true;
30+
return true;

‎src/it/checkstyle-report/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656
<groupId>org.apache.maven.plugins</groupId>
5757
<artifactId>maven-checkstyle-plugin</artifactId>
5858
<version>@project.version@</version>
59-
<configuration>
60-
<enableRSS>true</enableRSS>
61-
</configuration>
6259
<reportSets>
6360
<reportSet>
6461
<reports>

‎src/it/checkstyle-report/verify.groovy

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,4 @@ assert new File(basedir, 'target/checkstyle-checker.xml').exists();
2626
assert new File(basedir, 'target/checkstyle-header.txt').exists();
2727
assert new File(basedir, 'target/checkstyle-result.xml').exists();
2828

29-
File rssFile = new File( basedir, 'target/site/checkstyle.rss' );
30-
assert rssFile.exists();
31-
32-
def rss = new XmlParser().parse( rssFile );
33-
34-
def channel = rss.channel[0]
35-
36-
assert channel.title.text() == 'check-pass - Checkstyle report'
37-
38-
def item = channel.item[0]
39-
assert item != null
40-
assert item.title.text().startsWith('File: 1,')
41-
42-
43-
return true;
29+
return true;

0 commit comments

Comments
 (0)