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:32:00 UTC

[myfaces-tobago] 29/32: cherrypick from 2.x: build: checkstyle enhancements

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 96a8db4fbca520100538c9bacca422c3d367c864
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Feb 10 16:52:21 2022 +0100

    cherrypick from 2.x: build: checkstyle enhancements
---
 pom.xml                                    | 4 ++--
 tobago-example/tobago-example-demo/pom.xml | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6aecc03..22a5177 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
     <jsf.target>2.0</jsf.target>
     <required.maven.version>2.2.1</required.maven.version>
     <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-    <maven-checkstyle.version>8.45.1</maven-checkstyle.version>
+    <checkstyle.version>8.45.1</checkstyle.version>
     <checkstyle-rules.version>16-SNAPSHOT</checkstyle-rules.version>
     <tobago.basedir>${project.basedir}</tobago.basedir>
   </properties>
@@ -398,7 +398,7 @@
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>${maven-checkstyle.version}</version>
+            <version>${checkstyle.version}</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 4088b56..7b7fef3 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -643,7 +643,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>3.1.2</version>
+            <version>${maven-checkstyle-plugin.version}</version>
             <configuration>
               <configLocation>META-INF/checkstyle-tobago.xml</configLocation>
               <includes>**/*.xhtml,**/*.jsp,**/*.tag</includes>
@@ -656,6 +656,11 @@
                 <artifactId>tobago-core</artifactId>
                 <version>${project.version}</version>
               </dependency>
+              <dependency>
+                <groupId>com.puppycrawl.tools</groupId>
+                <artifactId>checkstyle</artifactId>
+                <version>${checkstyle.version}</version>
+              </dependency>
             </dependencies>
           </plugin>
         </plugins>