This is an automated email from the ASF dual-hosted git repository.

henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git


The following commit(s) were added to refs/heads/master by this push:
     new f909826e JEXL: Attempt to bump checkstyle from 9.3 to 10.3, add plugin 
profile for jdk8
     new 22d92e50 Merge remote-tracking branch 'origin/master'
f909826e is described below

commit f909826e96065db5c3e44a019e7e6e0abd60edca
Author: henrib <hen...@apache.org>
AuthorDate: Mon Jun 6 12:31:13 2022 +0200

    JEXL: Attempt to bump checkstyle from 9.3 to 10.3, add plugin profile for 
jdk8
---
 pom.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 88818ccf..68f79008 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
         <commons.jira.id>JEXL</commons.jira.id>
         <commons.jira.pid>12310479</commons.jira.pid>
         <checkstyle.plugin.version>3.1.2</checkstyle.plugin.version>
-        <checksyle.version>9.3</checksyle.version>
+        <checkstyle.version>10.3</checkstyle.version>
         <japicmp.skip>false</japicmp.skip>
         <commons.japicmp.version>0.15.7</commons.japicmp.version>
         <commons.pmd.version>3.16.0</commons.pmd.version>
@@ -90,6 +90,19 @@
         <commons.releaseManagerKey>4E066E0459CD109B</commons.releaseManagerKey>
     </properties>
 
+    <!-- Checkstyle 10 is incompatible with jdk 8, keep 9.3 -->
+    <profiles>
+        <profile>
+            <id>jdk8-plugin-fix-version</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <properties>
+                <checkstyle.version>9.3</checkstyle.version>
+            </properties>
+        </profile>
+    </profiles>
+
     <scm>
         
<connection>scm:git:https://gitbox.apache.org/repos/asf/commons-jexl.git</connection>
         
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-jexl.git</developerConnection>
@@ -227,7 +240,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>${checksyle.version}</version>
+                        <version>${checkstyle.version}</version>
                         <exclusions><!-- MCHECKSTYLE-156 -->
                             <exclusion>
                                 <groupId>com.sun</groupId>

Reply via email to