Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>6.2189.v695a_c41f5249</version>
<version>6.2221.va_045130417c9</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -59,7 +59,7 @@
<jenkins.baseline>2.516</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<hpi.bundledArtifacts>commons-csv,hsqldb,jackcess,plexus-utils,ucanaccess</hpi.bundledArtifacts>
<hpi.bundledArtifacts>commons-csv,hsqldb,jackcess,ucanaccess</hpi.bundledArtifacts>
<hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
<concurrency>2</concurrency>
<!-- disable SpotBugs temporarily since there are 62 bugs -->
Expand Down Expand Up @@ -95,11 +95,6 @@
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>4.0.3</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>gson-api</artifactId>
Expand Down Expand Up @@ -150,9 +145,23 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.ucanaccess</groupId>
<groupId>io.github.spannm</groupId>
<artifactId>ucanaccess</artifactId>
<version>5.0.1</version>
<version>5.1.7</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import hudson.tasks.Builder;
import jenkins.tasks.SimpleBuildStep;
import org.apache.commons.io.output.NullOutputStream;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.apache.tools.ant.types.Commandline;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;
Expand Down Expand Up @@ -318,7 +318,7 @@ private int runPerformanceTest(FilePath bztWorkingDirectory, FilePath workspace,
testCommand.add((isVirtualenvInstallation ? getVirtualenvPath(workspace) : "") + PERFORMANCE_TEST_COMMAND);
String[] parsedParams;
try {
parsedParams = CommandLineUtils.translateCommandline(envVars.expand(this.params));
parsedParams = Commandline.translateCommandline(envVars.expand(this.params));
} catch (Exception e) {
logger.println("Failed parse Taurus parameters");
e.printStackTrace(logger);
Expand Down