Merge pull request #263 from jenkinsci/save-folders

Fix saving of source code root folders
jenkinsci · Nov 8, 2019 · 2897e1b · 2897e1b
2 parents 614828d + b6697bb
commit 2897e1b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -879,6 +879,14 @@
                 <justification>Dependencies are not being checked, so they are reported as missing</justification>
               </item>
             </revapi.ignore>
+            <revapi.ignore>
+              <item>
+                <regex>false</regex>
+                <code>java.method.parameterTypeChanged</code>
+                <classSimpleName>WarningsPluginConfiguration</classSimpleName>
+                <justification>Nobody should depend on that method</justification>
+              </item>
+            </revapi.ignore>
           </analysisConfiguration>
         </configuration>
         <executions>

diff --git a/src/main/java/io/jenkins/plugins/analysis/core/model/WarningsPluginConfiguration.java b/src/main/java/io/jenkins/plugins/analysis/core/model/WarningsPluginConfiguration.java
@@ -72,7 +72,7 @@ public List<SourceDirectory> getSourceDirectories() {
      *         the source directories that contain the affected files
      */
     @DataBoundSetter
-    public void setSourceDirectories(final Collection<SourceDirectory> sourceDirectories) {
+    public void setSourceDirectories(final List<SourceDirectory> sourceDirectories) {
         this.sourceDirectories = new ArrayList<>(sourceDirectories);
 
         PathUtil pathUtil = new PathUtil();
@@ -87,7 +87,7 @@ public void setSourceDirectories(final Collection<SourceDirectory> sourceDirecto
     /**
      * Filters the specified collection of additional directories so that only permitted source directories will be
      * returned. Permitted source directories are absolute paths that have been registered using {@link
-     * #setSourceDirectories(Collection)} or relative paths in the workspace.
+     * #setSourceDirectories(List)} or relative paths in the workspace.
      *
      * @param workspace
      *         the workspace containing the affected files