Skip to content

Commit e3aaf3a

Browse files
authored
Merge pull request #76 from jenkinsci/dev/devm/release-new-version
Prepare for Jenkins 11.0.0 plugin release
2 parents b4b385d + e97c493 commit e3aaf3a

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ java {
5555
project.ext.excludesFromTestCoverage = ['**/DetectDownloadStrategy.java', '**/DetectPipelineStep.java', '**/DetectPostBuildStep.java', '**/DetectAirGapInstallation.java']
5656

5757
group = 'com.blackducksoftware.integration'
58-
version = '10.0.1-SNAPSHOT'
58+
version = '11.0.0-SIGQA2-SNAPSHOT'
5959
description = 'Black Duck Detect for Jenkins'
6060

6161
apply plugin: 'com.blackduck.integration.solution'
@@ -67,9 +67,9 @@ artifactory {
6767
}
6868

6969
jenkinsPlugin {
70-
jenkinsVersion = '2.426.3' // as of version 0.40.0 of jpi, it's jenkinsVersion...
70+
jenkinsVersion = '2.462.3' // as of version 0.40.0 of jpi, it's jenkinsVersion...
7171
displayName = 'Black Duck Detect'
72-
compatibleSinceVersion = '10.0.0'
72+
compatibleSinceVersion = '11.0.0'
7373
url = 'https://github.com/jenkinsci/blackduck-detect-plugin'
7474
gitHubUrl = 'https://github.com/jenkinsci/blackduck-detect-plugin'
7575

@@ -83,7 +83,7 @@ dependencies {
8383
implementation 'org.checkerframework:checker-qual:3.33.0'
8484
implementation 'com.google.j2objc:j2objc-annotations:2.8'
8585

86-
implementation 'com.blackduck.integration:blackduck-common:67.0.1'
86+
implementation 'com.blackduck.integration:blackduck-common:67.0.20'
8787
implementation('com.blackduck.integration:jenkins-common:1.0.0'){
8888
exclude group: "org.jenkins-ci.main", module: "jenkins-core"
8989
exclude group: "org.jenkins-ci.plugins", module: "credentials"

src/main/java/com/blackduck/integration/jenkins/detect/service/strategy/DetectScriptStrategy.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434

3535
public class DetectScriptStrategy extends DetectExecutionStrategy {
3636
public static final String DETECT_INSTALL_DIRECTORY = "Detect_Installation";
37-
public static final String SUPPORTED_SHELL_SCRIPT_URL = "https://detect.blackduck.com/detect10.sh";
38-
public static final String SHELL_SCRIPT_FILENAME = "detect10.sh";
39-
public static final String SUPPORTED_POWERSHELL_SCRIPT_URL = "https://detect.blackduck.com/detect10.ps1";
40-
public static final String POWERSHELL_SCRIPT_FILENAME = "detect10.ps1";
37+
public static final String SUPPORTED_SHELL_SCRIPT_URL = "https://detect.blackduck.com/detect11.sh";
38+
public static final String SHELL_SCRIPT_FILENAME = "detect11.sh";
39+
public static final String SUPPORTED_POWERSHELL_SCRIPT_URL = "https://detect.blackduck.com/detect11.ps1";
40+
public static final String POWERSHELL_SCRIPT_FILENAME = "detect11.ps1";
4141

4242
private final JenkinsIntLogger logger;
4343
private final OperatingSystemType operatingSystemType;

src/test/java/com/blackduck/integration/jenkins/detect/DetectRunnerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public class DetectRunnerTest {
4646
private static final String JDK_HOME = "/tmp/jdk/bin/java";
4747
private static final String DETECT_JAR_PATH = "/tmp/detect.jar";
4848
private static final String DETECT_AIRGAP_JAR_PATH = "/tmp/airgap/detect.jar";
49-
private static final String DETECT_SHELL_PATH = "/tmp/detect10.sh";
50-
private static final String DETECT_POWERSHELL_PATH = "/tmp/detect10.ps1";
49+
private static final String DETECT_SHELL_PATH = "/tmp/detect11.sh";
50+
private static final String DETECT_POWERSHELL_PATH = "/tmp/detect11.ps1";
5151
private static final String AIRGAP_TOOL_NAME = "AirGap_Tool";
5252
private static final String AIRGAP_TOOL_PATH = "/air/gap/tool/path";
5353
private static final AirGapDownloadStrategy AIRGAP_DOWNLOAD_STRATEGY = new AirGapDownloadStrategy();

0 commit comments

Comments
 (0)