Merge branch 'cit'

# Conflicts: # groovy-jacoco-previous/pom.xml
pmayweg · Sep 4, 2020 · fc16bfa · fc16bfa
2 parents 2715416 + db7308f
commit fc16bfa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/codenarc-converter/pom.xml b/codenarc-converter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.sonarsource.groovy</groupId>
     <artifactId>groovy</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7-CIT-MVN-162-SNAPSHOT</version>
   </parent>
 
   <artifactId>sonar-codenarc-converter</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.sonarsource.groovy</groupId>
   <artifactId>groovy</artifactId>
-  <version>1.7-SNAPSHOT</version>
+  <version>1.7-CIT-MVN-162-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Sonar Groovy</name>

diff --git a/sonar-groovy-plugin/pom.xml b/sonar-groovy-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.sonarsource.groovy</groupId>
     <artifactId>groovy</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7-CIT-MVN-162-SNAPSHOT</version>
   </parent>
 
   <artifactId>sonar-groovy-plugin</artifactId>

diff --git a/sonar-groovy-plugin/src/main/java/org/sonar/plugins/groovy/jacoco/JaCoCoAnalyzer.java b/sonar-groovy-plugin/src/main/java/org/sonar/plugins/groovy/jacoco/JaCoCoAnalyzer.java
@@ -81,7 +81,7 @@ private InputFile getInputFile(ISourceFileCoverage coverage) {
     String path = getFileRelativePath(coverage);
     InputFile sourceInputFileFromRelativePath =
         groovyFileSystem.sourceInputFileFromRelativePath(path);
-    if (sourceInputFileFromRelativePath == null) {
+    if (sourceInputFileFromRelativePath == null && path.endsWith(".groovy")) {
       JaCoCoExtensions.logger().warn("File not found: " + path);
     }
     return sourceInputFileFromRelativePath;