Skip to content

Commit f035707

Browse files
authored
build: update dependencies (#134)
- Updates base plugin from 5.7 to 5.17 - Updates minimum Jenkins required version from 2.479.1 to 2.479.3 - Updates base bom from 4136.vca_c3202a_7fd1 to 4488.v7fe26526366e - Updates sysdig cli version from 1.22.1 to 1.22.3 - Updates nix flake dev dependencies
1 parent f921e51 commit f035707

File tree

6 files changed

+24
-14
lines changed

6 files changed

+24
-14
lines changed

Makefile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11

2-
update: update-parent-pom update-dependencies
2+
update: update-parent-pom update-dependencies update-flake update-sysdig-cli-version
33

44
update-parent-pom:
5-
mvn versions:update-parent
5+
mvn versions:update-parent -DgenerateBackupPoms=false
66

77
update-dependencies:
88
mvn versions:use-latest-versions
99

1010
verify:
1111
mvn clean verify javadoc:jar
12+
13+
update-flake:
14+
-nix flake update
15+
16+
update-sysdig-cli-version:
17+
@echo "Fetching latest sysdig version…"
18+
@latest=$$(curl -sfSL https://download.sysdig.com/scanning/sysdig-cli-scanner/latest_version.txt) && \
19+
echo "Latest: $$latest" && \
20+
sed -i -E 's/(private static final String FIXED_SCANNED_VERSION = ")([^"]+)(")/\1'$$latest'\3/' src/main/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/RemoteSysdigImageScanner.java && \
21+
echo "Version updated"

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>5.7</version>
8+
<version>5.17</version>
99
<relativePath />
1010
</parent>
1111

@@ -27,7 +27,7 @@
2727
<!-- You can check out which versions are being used per version in https://stats.jenkins.io/pluginversions/sysdig-secure.html -->
2828
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
2929
<jenkins.baseline>2.479</jenkins.baseline>
30-
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
30+
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
3131
<!-- https://www.jenkins.io/doc/developer/plugin-development/mark-a-plugin-incompatible/ -->
3232
<hpi.compatibleSinceVersion>3.0</hpi.compatibleSinceVersion>
3333
</properties>
@@ -39,7 +39,7 @@
3939
<groupId>io.jenkins.tools.bom</groupId>
4040
<artifactId>bom-${jenkins.baseline}.x</artifactId>
4141
<!-- You can find your version for the selected baseline in: https://repo.jenkins-ci.org/public/io/jenkins/tools/bom/ -->
42-
<version>4136.vca_c3202a_7fd1</version>
42+
<version>4488.v7fe26526366e</version>
4343
<type>pom</type>
4444
<scope>import</scope>
4545
</dependency>

src/main/java/com/sysdig/jenkins/plugins/sysdig/infrastructure/scanner/RemoteSysdigImageScanner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535

3636
public class RemoteSysdigImageScanner {
37-
private static final String FIXED_SCANNED_VERSION = "1.22.1";
37+
private static final String FIXED_SCANNED_VERSION = "1.22.3";
3838
private final ScannerPaths scannerPaths;
3939
private final String imageName;
4040
private final RetriableRemoteDownloader retriableRemoteDownloader;

src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/ImageScanningE2EFreestyleTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void testFreestyleWithCredentialsAndAssertLogOutput() throws Exception {
4040

4141
jenkins.assertLogContains("Using new-scanning engine", build);
4242
jenkins.assertLogContains("Image Name: alpine", build);
43-
jenkins.assertLogContains("Downloading inlinescan v1.22.1", build);
43+
jenkins.assertLogContains("Downloading inlinescan v1.22.3", build);
4444
jenkins.assertLogContains("--apiurl=https://secure.sysdig.com", build);
4545
jenkins.assertLogContains("--loglevel=info --console-log alpine", build);
4646
jenkins.assertLogContains("Check that the API token is provided and is valid for the specified URL.", build);

src/test/java/com/sysdig/jenkins/plugins/sysdig/e2e/ImageScanningE2EPipelineTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void testPipelineWithCredentialsAndAssertLogOutput() throws Exception {
4242

4343
jenkins.assertLogContains("Using new-scanning engine", build);
4444
jenkins.assertLogContains("Image Name: alpine", build);
45-
jenkins.assertLogContains("Downloading inlinescan v1.22.1", build);
45+
jenkins.assertLogContains("Downloading inlinescan v1.22.3", build);
4646
jenkins.assertLogContains("Check that the API token is provided and is valid for the specified URL.", build);
4747
}
4848

0 commit comments

Comments
 (0)