Skip to content

Commit

Permalink
Prepare for Doxia 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@michael-o
michael-o committed May 14, 2023
1 parent b72b1f6 commit e75f84d
Show file tree
Hide file tree
Showing 41 changed files with 204 additions and 952 deletions.
49 changes: 11 additions & 38 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ under the License.
</parent>

<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-M1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>Apache Maven Checkstyle Plugin</name>
Expand Down Expand Up @@ -67,10 +67,10 @@ under the License.
<aetherVersion>1.0.0.v20140518</aetherVersion>
<mavenVersion>3.2.5</mavenVersion>
<checkstyleVersion>9.3</checkstyleVersion>
<doxiaVersion>1.11.1</doxiaVersion>
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
<sitePluginVersion>3.12.1</sitePluginVersion>
<jxrPluginVersion>3.3.0</jxrPluginVersion>
<doxiaVersion>2.0.0-M6</doxiaVersion>
<doxiaSitetoolsVersion>2.0.0-M10</doxiaSitetoolsVersion>
<sitePluginVersion>4.0.0-M8</sitePluginVersion>
<jxrPluginVersion>4.0.0-M1-SNAPSHOT</jxrPluginVersion>
<project.build.outputTimestamp>2023-04-18T14:54:00Z</project.build.outputTimestamp>
</properties>

Expand Down Expand Up @@ -122,12 +122,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>3.1.1</version>
<version>4.0.0-M6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>3.2.0</version>
<version>4.0.0-M8</version>
</dependency>

<!-- doxia -->
Expand Down Expand Up @@ -166,42 +166,15 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.4.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
<version>1.2</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
</exclusion>
<exclusion>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
</exclusion>
</exclusions>
<version>3.5.1</version>
</dependency>

<!-- checkstyle -->
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyleVersion}</version>
</dependency>

<!-- misc -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.7</version>
</dependency>

<!-- test -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down Expand Up @@ -260,7 +233,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<version>3.5.1</version>
<version>3.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -297,7 +270,7 @@ under the License.
<plugin>
<!-- check with parent pom upgrade -->
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.1</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
Expand All @@ -307,7 +280,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-resources</artifactId>
<version>4</version>
<version>5</version>
</dependency>
</dependencies>
</plugin>
Expand Down
3 changes: 0 additions & 3 deletions src/it/MCHECKSTYLE-357-with-header-override/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,6 @@
<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<enableRSS>true</enableRSS>
</configuration>
<reportSets>
<reportSet>
<reports>
Expand Down
3 changes: 0 additions & 3 deletions src/it/MCHECKSTYLE-357-with-header-override/verify.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,4 @@ assert new File(basedir, 'target/checkstyle-checker.xml').exists();
assert new File(basedir, 'target/checkstyle-result.xml').exists();
assert new File(basedir, 'target/checkstyle-rules.xml').exists();

File rssFile = new File( basedir, 'target/site/checkstyle.rss' );
assert rssFile.exists();

return true;
3 changes: 0 additions & 3 deletions src/it/MCHECKSTYLE-357/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,6 @@
<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<enableRSS>true</enableRSS>
</configuration>
<reportSets>
<reportSet>
<reports>
Expand Down
3 changes: 0 additions & 3 deletions src/it/MCHECKSTYLE-357/verify.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,4 @@ assert new File(basedir, 'target/checkstyle-checker.xml').exists();
assert new File(basedir, 'target/checkstyle-result.xml').exists();
assert new File(basedir, 'target/checkstyle-rules.xml').exists();

File rssFile = new File( basedir, 'target/site/checkstyle.rss' );
assert rssFile.exists();

return true;
170 changes: 85 additions & 85 deletions src/it/MCHECKSTYLE-70-multi-sourcefolder/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,85 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
~ regarding copyright ownership. The ASF licenses this file
~ to you under the Apache License, Version 2.0 (the
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.maven.plugins.checkstyle</groupId>
<artifactId>multi-sourcefolder</artifactId>
<version>1.0-SNAPSHOT</version>

<url>https://issues.apache.org/jira/browse/MCHECKSTYLE-70</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>main-source</id>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/additional/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>test-source</id>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/test-additional/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<id>check</id>
<goals>
<goal>check</goal>
</goals>
<configuration>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
~ regarding copyright ownership. The ASF licenses this file
~ to you under the Apache License, Version 2.0 (the
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.maven.plugins.checkstyle</groupId>
<artifactId>multi-sourcefolder</artifactId>
<version>1.0-SNAPSHOT</version>

<url>https://issues.apache.org/jira/browse/MCHECKSTYLE-70</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>main-source</id>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/additional/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>test-source</id>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/test-additional/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<id>check</id>
<goals>
<goal>check</goal>
</goals>
<configuration>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion src/it/check-pass/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
3 changes: 0 additions & 3 deletions src/it/checkstyle-goal/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<enableRSS>true</enableRSS>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
15 changes: 1 addition & 14 deletions src/it/checkstyle-goal/verify.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,7 @@ assert new File( basedir, 'target/checkstyle-checker.xml' ).exists();
assert new File( basedir, 'target/checkstyle-header.txt' ).exists();
assert new File( basedir, 'target/checkstyle-result.xml' ).exists();

File rssFile = new File( basedir, 'target/site/checkstyle.rss' );
assert rssFile.exists();

def rss = new XmlParser().parse( rssFile );

def channel = rss.channel[0]

assert channel.title.text() == 'check-pass - Checkstyle report'

def item = channel.item[0]
assert item != null
assert item.title.text().startsWith('File: 1,')

def html = new File( basedir, 'target/site/checkstyle.html' ).text;
assert html.contains( '<meta charset="UTF-8" />' );

return true;
return true;
3 changes: 0 additions & 3 deletions src/it/checkstyle-report/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<enableRSS>true</enableRSS>
</configuration>
<reportSets>
<reportSet>
<reports>
Expand Down
16 changes: 1 addition & 15 deletions src/it/checkstyle-report/verify.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,4 @@ assert new File(basedir, 'target/checkstyle-checker.xml').exists();
assert new File(basedir, 'target/checkstyle-header.txt').exists();
assert new File(basedir, 'target/checkstyle-result.xml').exists();

File rssFile = new File( basedir, 'target/site/checkstyle.rss' );
assert rssFile.exists();

def rss = new XmlParser().parse( rssFile );

def channel = rss.channel[0]

assert channel.title.text() == 'check-pass - Checkstyle report'

def item = channel.item[0]
assert item != null
assert item.title.text().startsWith('File: 1,')


return true;
return true;
Loading

0 comments on commit e75f84d

Please sign in to comment.