You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2022/02/13 13:31:53 UTC
[myfaces-tobago] 22/32: cherrypick from 2.x: build: use specific tobago-2 checkstyle
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit b7436497ffe4e53405200270370ee64f2e132c30
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed Feb 9 17:51:15 2022 +0100
cherrypick from 2.x: build: use specific tobago-2 checkstyle
* update checkstyle
* update dependency
---
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index f7ac60a..410ea1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsf.target>2.0</jsf.target>
<required.maven.version>2.2.1</required.maven.version>
- <checkstyle-rules.version>15</checkstyle-rules.version>
+ <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+ <checkstyle-rules.version>16-SNAPSHOT</checkstyle-rules.version>
<tobago.basedir>${project.basedir}</tobago.basedir>
</properties>
@@ -371,7 +372,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9</version>
+ <version>${maven-checkstyle-plugin.version}</version>
<executions>
<execution>
<id>verify-style</id>
@@ -379,7 +380,7 @@
</execution>
</executions>
<configuration>
- <configLocation>tobago/checkstyle.xml</configLocation>
+ <configLocation>tobago/checkstyle-for-tobago-2.x.xml</configLocation>
<headerLocation>default/myfaces-header.txt</headerLocation>
<xrefLocation>xref</xrefLocation>
<excludes>**/package-info.java</excludes>
@@ -390,8 +391,7 @@
<dependency>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>checkstyle-rules</artifactId>
- <version>6</version>
- <!--<version>${checkstyle-rules.version}</version>-->
+ <version>${checkstyle-rules.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -544,7 +544,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9</version>
+ <version>${maven-checkstyle-plugin.version}</version>
<configuration>
<configLocation>tobago/checkstyle.xml</configLocation>
<headerLocation>default/myfaces-header.txt</headerLocation>