Update checkstyle config for checkstyle 10, move to java11, update version number to 4.0-SNAP
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index 40e23a6..35b6805 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.cxf.build-utils</groupId>
<artifactId>cxf-build-utils</artifactId>
- <version>3.4.5-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/buildtools/src/main/resources/cxf-checkstyle-corba.xml b/buildtools/src/main/resources/cxf-checkstyle-corba.xml
index 3a96eec..f46f07f 100644
--- a/buildtools/src/main/resources/cxf-checkstyle-corba.xml
+++ b/buildtools/src/main/resources/cxf-checkstyle-corba.xml
@@ -215,7 +215,10 @@
<!--<module name="MultipleStringLiterals"/>-->
<module name="MultipleVariableDeclarations" />
<!--<module name="RequireThis"/>-->
- <module name="UnnecessaryParentheses" />
+ <module name="UnnecessaryParentheses">
+ <!-- Don't do LAND,LOR,GT,LT,GE,LE,EQUAL,NOT_EQUAL -->
+ <property name="tokens" value="EXPR,IDENT,NUM_DOUBLE,NUM_FLOAT,NUM_INT,NUM_LONG,STRING_LITERAL,LITERAL_NULL,LITERAL_FALSE,LITERAL_TRUE,ASSIGN,BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN,LAMBDA,TEXT_BLOCK_LITERAL_BEGIN,,LITERAL_INSTANCEOF,UNARY_MINUS,UNARY_PLUS,INC,DEC,LNOT,BNOT,POST_INC,POST_DEC" />
+ </module>
diff --git a/buildtools/src/main/resources/cxf-checkstyle.xml b/buildtools/src/main/resources/cxf-checkstyle.xml
index c0fc21f..0883111 100644
--- a/buildtools/src/main/resources/cxf-checkstyle.xml
+++ b/buildtools/src/main/resources/cxf-checkstyle.xml
@@ -207,7 +207,10 @@
<!--<module name="MultipleStringLiterals"/>-->
<module name="MultipleVariableDeclarations" />
<!--<module name="RequireThis"/>-->
- <module name="UnnecessaryParentheses" />
+ <module name="UnnecessaryParentheses">
+ <!-- Don't do LAND,LOR,GT,LT,GE,LE,EQUAL,NOT_EQUAL -->
+ <property name="tokens" value="EXPR,IDENT,NUM_DOUBLE,NUM_FLOAT,NUM_INT,NUM_LONG,STRING_LITERAL,LITERAL_NULL,LITERAL_FALSE,LITERAL_TRUE,ASSIGN,BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN,LAMBDA,TEXT_BLOCK_LITERAL_BEGIN,,LITERAL_INSTANCEOF,UNARY_MINUS,UNARY_PLUS,INC,DEC,LNOT,BNOT,POST_INC,POST_DEC" />
+ </module>
diff --git a/pom.xml b/pom.xml
index bb46a94..f2d1e7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.build-utils</groupId>
<artifactId>cxf-build-utils</artifactId>
- <version>3.4.5-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<name>Apache CXF Build Utilities</name>
<url>https://cxf.apache.org</url>
<packaging>pom</packaging>
@@ -145,8 +145,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>11</source>
+ <target>11</target>
<maxmem>256M</maxmem>
</configuration>
</plugin>
diff --git a/xml2fastinfoset-plugin/pom.xml b/xml2fastinfoset-plugin/pom.xml
index 0998d0c..e741d4e 100644
--- a/xml2fastinfoset-plugin/pom.xml
+++ b/xml2fastinfoset-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.cxf.build-utils</groupId>
<artifactId>cxf-build-utils</artifactId>
- <version>3.4.5-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
diff --git a/xml2fastinfoset-test/pom.xml b/xml2fastinfoset-test/pom.xml
index a6046ab..9b3425a 100644
--- a/xml2fastinfoset-test/pom.xml
+++ b/xml2fastinfoset-test/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cxf.build-utils</groupId>
<artifactId>cxf-build-utils</artifactId>
- <version>3.4.5-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
