You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/05/20 09:08:14 UTC

[syncope] branch 2_1_X updated: Upgrading Tika, maven-checkstyle-plugin

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

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_1_X by this push:
     new 92ab009  Upgrading Tika, maven-checkstyle-plugin
92ab009 is described below

commit 92ab009968a48b9a347dfe3898a330f129a25e26
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon May 20 11:07:36 2019 +0200

    Upgrading Tika, maven-checkstyle-plugin
---
 pom.xml                                              |  9 +++++++--
 src/main/resources/org/apache/syncope/checkstyle.xml | 11 ++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index f8bcbab..b5c5a60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -430,7 +430,7 @@ under the License.
     <commons-text.version>1.6</commons-text.version>
     <commons-logging.version>1.1.3</commons-logging.version>
     
-    <tika.version>1.20</tika.version>
+    <tika.version>1.21</tika.version>
 
     <joda.version>2.10.2</joda.version>
 
@@ -2026,7 +2026,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.0</version>
           <configuration>
             <configLocation>${rootpom.basedir}/src/main/resources/org/apache/syncope/checkstyle.xml</configLocation>
             <targetJdk>${targetJdk}</targetJdk>
@@ -2446,6 +2446,11 @@ under the License.
           </reportSet>
         </reportSets>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>3.0.0</version>
+      </plugin>
     </plugins>
   </reporting>
 
diff --git a/src/main/resources/org/apache/syncope/checkstyle.xml b/src/main/resources/org/apache/syncope/checkstyle.xml
index 27be37a..012e3f3 100644
--- a/src/main/resources/org/apache/syncope/checkstyle.xml
+++ b/src/main/resources/org/apache/syncope/checkstyle.xml
@@ -46,6 +46,9 @@ under the License.
 
 -->
 <module name="Checker">
+
+  <property name="cacheFile" value="target/checkstyle.cache"/>
+
   <!--
         If you set the basedir property below, then all reported file
         names will be relative to the specified directory. See
@@ -83,12 +86,8 @@ under the License.
     <property name="message" value="Line has trailing spaces."/>
   </module>
 
-  <module name="SuppressionCommentFilter"/>
-
   <module name="TreeWalker">
 
-    <property name="cacheFile" value="target/checkstyle.cache"/>
-
     <!-- Checks for Javadoc comments.                     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html -->
     <!--<module name="JavadocMethod">
@@ -116,7 +115,7 @@ under the License.
       <property name="format" value="^[A-Z][A-Z0-9_]*$"/>
     </module>
     <module name="TypeName"/>
-
+    <module name="SuppressionCommentFilter"/>
 
     <!-- Checks for Headers                                -->
     <!-- See http://checkstyle.sf.net/config_header.html   -->
@@ -219,8 +218,6 @@ under the License.
     <module name="FinalParameters"/>
     <module name="TodoComment"/>
     <module name="UpperEll"/>
-
-    <module name="FileContentsHolder"/>
   </module>
 
 </module>