Skip to content

Commit

Permalink
Add support for Warnings Next Generation 10.x.
Browse files Browse the repository at this point in the history 
* Warnings Next Generation 10.0.3+ is now required.
* Add dependency on Popper.js 2 API plugin to remove related warnings in Jenkins log.
* Update required xUnit dependency version, so we can save the configurations in "Publish xUnit test result report" section successfully.
* Remove some unnecessary dependencies.
  • Loading branch information
@awang-parasoft
awang-parasoft committed Mar 27, 2023
1 parent dfa3fcf commit fa105b0
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 121 deletions.
167 changes: 68 additions & 99 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.49</version> <!-- or later -->
<version>4.56</version> <!-- or later -->
</parent>

<groupId>com.parasoft</groupId>
Expand All @@ -20,12 +20,10 @@
</organization>

<properties>
<jenkins.version>2.289.1</jenkins.version>
<jenkins.version>2.387.1</jenkins.version>
<java.level>8</java.level>
<parasoft.repository.url>file:///${basedir}/repository</parasoft.repository.url>
<xtest.version>10.6.1.20221021</xtest.version>
<asm.version>9.3</asm.version>
<slf4j.version>1.7.32</slf4j.version>
</properties>

<developers>
Expand All @@ -52,7 +50,7 @@

<scm>
<connection>scm:git:ssh://github.com/jenkinsci/parasoft-findings-plugin.git</connection>
<developerConnection>scm:git:ssh://git@github.com/jenkinsci/parasoft-findings-plugin.git</developerConnection>
<developerConnection>scm:git:git@github.com/jenkinsci/parasoft-findings-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/parasoft-findings-plugin</url>
<tag>master</tag>
</scm>
Expand Down Expand Up @@ -170,11 +168,48 @@
</pluginRepository>
</pluginRepositories>

<dependencyManagement>
<dependencies>
<!-- Work around "Require upper bound dependencies error for io.jenkins.plugins:javax-activation-api:1.2.0-3" for warnings-ng. -->
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>javax-activation-api</artifactId>
<version>1.2.0-5</version>
</dependency>
<!-- Work around "Require upper bound dependencies error for net.minidev:json-smart:2.4.8" for warnings-ng. -->
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.4.10</version>
</dependency>
<!-- Work around "Require upper bound dependencies error for org.jsoup:jsoup:1.15.3" for warnings-ng. -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.15.4</version>
</dependency>
<!-- shared by xunit and warnings-ng - synchronize with warnings-ng
Work around "Require upper bound dependencies error for io.jenkins.plugins:jaxb:2.3.6-1" for warnings-ng. -->
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>jaxb</artifactId>
<version>2.3.8-1</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Remove "o.k.s.f.adjunct.AdjunctsInPage#findNeeded: No such adjunct found: io.jenkins.plugins.popper2" warning and related stacktrace in Jenkins log. -->
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>popper2-api</artifactId>
<version>2.11.6-2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>warnings-ng</artifactId>
<version>9.10.3</version>
<version>10.0.3</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand All @@ -200,6 +235,24 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<!-- shared by xtest(2.13.4) and warnings-ng(2.14.2) - synchronize with xtest(2.13.4)
Work around the following require upper bound dependencies errors:
* com.fasterxml.jackson.core:jackson-core:2.13.4
* com.fasterxml.jackson.core:jackson-annotations:2.13.4
* com.fasterxml.jackson.core:jackson-databind:2.13.4.2
-->
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- shared by xtest and warnings-ng - synchronize with xtest -->
Expand Down Expand Up @@ -237,18 +290,24 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>xunit</artifactId>
<version>1.102</version>
<version>3.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.11</version>
<version>1.10.12</version>
</dependency>
<!-- Override parent spotbugs-annotations dependency and use version as in WNG -->
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.2.3</version><!--$NO-MVN-MAN-VER$-->
<version>4.7.3</version><!--$NO-MVN-MAN-VER$-->
</dependency>
<!-- Override parent jsr305 dependency and use version as in spotbugs-annotations -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down Expand Up @@ -457,18 +516,6 @@
<scope>runtime</scope>
</dependency>
<!-- these are needed only for tests -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
Expand All @@ -481,83 +528,5 @@
<version>6.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
<version>1.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>cloudbees-folder</artifactId>
<version>6.16</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>2.6.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
<version>1.15</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-annotation</artifactId>
<version>1.25</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>${asm.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>${asm.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
14 changes: 11 additions & 3 deletions src/main/java/com/parasoft/xtest/reports/jenkins/tool/ParasoftTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Map;
import java.util.Properties;

import edu.hm.hafner.util.VisibleForTesting;
import org.apache.commons.lang3.StringUtils;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
Expand All @@ -48,7 +49,7 @@
import io.jenkins.plugins.analysis.core.model.IconLabelProvider;
import io.jenkins.plugins.analysis.core.model.ReportScanningTool;
import io.jenkins.plugins.analysis.core.model.StaticAnalysisLabelProvider;
import io.jenkins.plugins.analysis.core.util.LogHandler;
import io.jenkins.plugins.util.LogHandler;
import io.jenkins.plugins.util.JenkinsFacade;

public class ParasoftTool
Expand Down Expand Up @@ -159,12 +160,19 @@ public String getUrl() {
}
}

private static class LabelProvider
public static class LabelProvider
extends IconLabelProvider
{

private static final String ICONS_PREFIX = "/plugin/parasoft-findings/icons/"; //$NON-NLS-1$

private JenkinsFacade jenkins = new JenkinsFacade();

@VisibleForTesting
public void setJenkinsFacade(final JenkinsFacade jenkinsFacade) {
this.jenkins = jenkinsFacade;
}

LabelProvider()
{
super(PLUGIN_ID, Messages.PARASOFT_NAME);
Expand All @@ -185,7 +193,7 @@ public String getSmallIconUrl()
@Override
public DetailsTableModel getIssuesModel(Run<?, ?> build, String url, Report report)
{
return new ParasoftTableModel(build, report, getFileNameRenderer(build), getAgeBuilder(build, url), this, new JenkinsFacade());
return new ParasoftTableModel(build, report, getFileNameRenderer(build), getAgeBuilder(build, url), this, jenkins);
}

@Override
Expand Down
46 changes: 27 additions & 19 deletions src/test/java/com/parasoft/xtest/reports/jenkins/ParasoftToolTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,37 @@

package com.parasoft.xtest.reports.jenkins;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.List;
import java.util.Set;

import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;

import com.parasoft.xtest.common.io.FileUtil;
import com.parasoft.xtest.common.services.RawServiceContext;
import com.parasoft.xtest.reports.jenkins.internal.services.JenkinsServicesProvider;
import com.parasoft.xtest.reports.jenkins.tool.ParasoftTableModel;
import com.parasoft.xtest.reports.jenkins.tool.ParasoftTableModel.ParasoftTableRow;
import com.parasoft.xtest.reports.jenkins.tool.ParasoftTool;
import com.parasoft.xtest.reports.jenkins.tool.ParasoftTool.Descriptor;

import edu.hm.hafner.analysis.Report;
import edu.hm.hafner.analysis.Severity;
import hudson.EnvVars;
import hudson.FilePath;
import hudson.model.FreeStyleBuild;
import hudson.model.TaskListener;
import io.jenkins.plugins.analysis.core.model.StaticAnalysisLabelProvider;
import io.jenkins.plugins.analysis.core.model.ReportScanningTool;
import io.jenkins.plugins.analysis.core.model.ReportScanningTool.ReportScanningToolDescriptor;
import io.jenkins.plugins.analysis.core.util.LogHandler;
import io.jenkins.plugins.analysis.core.model.StaticAnalysisLabelProvider;
import io.jenkins.plugins.util.JenkinsFacade;
import io.jenkins.plugins.util.LogHandler;
import org.jenkins.ui.symbol.SymbolRequest;
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;

import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.List;
import java.util.Set;

import static org.junit.Assert.*;
import static org.mockito.Matchers.any;

public class ParasoftToolTest
{
Expand All @@ -59,9 +58,11 @@ public void scanReportTest()
.thenReturn(new EnvVars());
LogHandler logger = Mockito.mock(LogHandler.class);

ParasoftTool underTest = new UnderTest();
ParasoftTool underTest = Mockito.spy(new UnderTest());
underTest.setLocalSettingsPath(localSettingsPath);

Mockito.doReturn(new Descriptor()).when((ReportScanningTool)underTest).getDescriptor();

Report report = underTest.scan(freeStyleBuild,
new FilePath(new File("src/test/resources/xml")),
Charset.forName("UTF-8"), logger);
Expand Down Expand Up @@ -92,6 +93,10 @@ public void labelProviderAndDescriptorTest() throws IOException, InterruptedExce
ParasoftTool underTest = new UnderTest();
underTest.setLocalSettingsPath(localSettingsPath);

JenkinsFacade jenkinsFacade = Mockito.mock(JenkinsFacade.class);
Mockito.when(jenkinsFacade.getDescriptorOrDie(any())).thenReturn(new Descriptor());
underTest.setJenkinsFacade(jenkinsFacade);

Report report = underTest.scan(freeStyleBuild,
new FilePath(new File("src/test/resources/xml")),
Charset.forName("UTF-8"), logger);
Expand All @@ -109,6 +114,9 @@ public void labelProviderAndDescriptorTest() throws IOException, InterruptedExce
assertEquals("/plugin/parasoft-findings/icons/parasofttest48.png", labelProvider.getLargeIconUrl());
assertEquals("/plugin/parasoft-findings/icons/parasofttest24.png", labelProvider.getSmallIconUrl());

Mockito.when(jenkinsFacade.getSymbol(any(SymbolRequest.class))).thenReturn("<svg>details-open-close-icon</svg>");
((ParasoftTool.LabelProvider) labelProvider).setJenkinsFacade(jenkinsFacade);

ParasoftTableModel model = (ParasoftTableModel)labelProvider.getIssuesModel(freeStyleBuild, "parasoft-findings", report);
assertEquals(9, model.getColumns().size());
assertEquals("issues", model.getId());
Expand Down

0 comments on commit fa105b0

Please sign in to comment.