Skip to content

Commit db88702

Browse files
basilbasil
authored
Refresh plugin for September 2024 (#341)
1 parent 884a4dd commit db88702

File tree

49 files changed

+183
-148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+183
-148
lines changed

Diff for: ‎.mvn/extensions.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.4</version>
5+
<version>1.8</version>
66
</extension>
77
</extensions>

Diff for: ‎Jenkinsfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
def configurations = [
2-
[ platform: 'linux', jdk: '8' ],
3-
[ platform: 'linux', jdk: '11', jenkins: '2.332.2' ],
4-
]
5-
buildPlugin(configurations: configurations)
1+
buildPlugin(configurations: [
2+
[platform: 'linux', jdk: 21],
3+
[platform: 'windows', jdk: 17],
4+
])

Diff for: ‎pom.xml

+33-15
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.46</version>
7+
<version>4.88</version>
88
<relativePath />
99
</parent>
1010
<groupId>com.datapipe.jenkins.plugins</groupId>
@@ -13,7 +13,7 @@
1313
<packaging>hpi</packaging>
1414
<properties>
1515
<changelist>9999-SNAPSHOT</changelist>
16-
<jenkins.version>2.303.3</jenkins.version>
16+
<jenkins.version>2.452.4</jenkins.version>
1717
<hpi.compatibleSinceVersion>2.0.0</hpi.compatibleSinceVersion>
1818
<gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
1919
</properties>
@@ -76,12 +76,12 @@
7676
<plugin>
7777
<groupId>org.apache.maven.plugins</groupId>
7878
<artifactId>maven-checkstyle-plugin</artifactId>
79-
<version>3.1.2</version>
79+
<version>3.5.0</version>
8080
<dependencies>
8181
<dependency>
8282
<groupId>com.puppycrawl.tools</groupId>
8383
<artifactId>checkstyle</artifactId>
84-
<version>8.31</version>
84+
<version>10.18.1</version>
8585
</dependency>
8686
</dependencies>
8787
</plugin>
@@ -117,9 +117,9 @@
117117
<artifactId>structs</artifactId>
118118
</dependency>
119119
<dependency>
120-
<groupId>com.bettercloud</groupId>
120+
<groupId>io.github.jopenlibs</groupId>
121121
<artifactId>vault-java-driver</artifactId>
122-
<version>5.1.0</version>
122+
<version>6.2.0</version>
123123
</dependency>
124124
<dependency>
125125
<groupId>org.jenkins-ci.plugins</groupId>
@@ -145,7 +145,6 @@
145145
<dependency>
146146
<groupId>org.jenkins-ci.plugins.aws-java-sdk</groupId>
147147
<artifactId>aws-java-sdk-minimal</artifactId>
148-
<version>1.12.246-349.v96b_b_f7eb_a_c3c</version>
149148
<optional>true</optional>
150149
</dependency>
151150
<!-- Test Dependencies -->
@@ -157,7 +156,7 @@
157156
<dependency>
158157
<groupId>org.testcontainers</groupId>
159158
<artifactId>vault</artifactId>
160-
<version>1.15.2</version>
159+
<version>1.20.1</version>
161160
<scope>test</scope>
162161
<exclusions>
163162
<exclusion>
@@ -175,11 +174,6 @@
175174
<artifactId>mockito-core</artifactId>
176175
<scope>test</scope>
177176
</dependency>
178-
<dependency>
179-
<groupId>org.mockito</groupId>
180-
<artifactId>mockito-inline</artifactId>
181-
<scope>test</scope>
182-
</dependency>
183177
<dependency>
184178
<groupId>org.jenkins-ci.plugins.workflow</groupId>
185179
<artifactId>workflow-job</artifactId>
@@ -220,11 +214,35 @@
220214
<dependencies>
221215
<dependency>
222216
<groupId>io.jenkins.tools.bom</groupId>
223-
<artifactId>bom-2.303.x</artifactId>
224-
<version>1500.ve4d05cd32975</version>
217+
<artifactId>bom-2.452.x</artifactId>
218+
<version>3387.v0f2773fa_3200</version>
225219
<scope>import</scope>
226220
<type>pom</type>
227221
</dependency>
228222
</dependencies>
229223
</dependencyManagement>
224+
<profiles>
225+
<profile>
226+
<id>jdk17</id>
227+
<activation>
228+
<jdk>[17,)</jdk>
229+
</activation>
230+
<properties />
231+
<build>
232+
<pluginManagement>
233+
<plugins>
234+
<plugin>
235+
<groupId>org.apache.maven.plugins</groupId>
236+
<artifactId>maven-surefire-plugin</artifactId>
237+
<configuration>
238+
<argLine>-Xms768M -Xmx768M -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1 @{jenkins.addOpens} @{jenkins.insaneHook}
239+
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
240+
--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED</argLine>
241+
</configuration>
242+
</plugin>
243+
</plugins>
244+
</pluginManagement>
245+
</build>
246+
</profile>
247+
</profiles>
230248
</project>

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/AwsHelper.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
77
import com.amazonaws.http.HttpMethodName;
88
import com.amazonaws.util.RuntimeHttpUtils;
9-
import com.bettercloud.vault.VaultException;
10-
import com.bettercloud.vault.api.Auth;
11-
import com.bettercloud.vault.json.JsonArray;
12-
import com.bettercloud.vault.json.JsonObject;
139
import com.datapipe.jenkins.vault.exception.VaultPluginException;
1410
import edu.umd.cs.findbugs.annotations.CheckForNull;
1511
import edu.umd.cs.findbugs.annotations.NonNull;
1612
import hudson.Util;
13+
import io.github.jopenlibs.vault.VaultException;
14+
import io.github.jopenlibs.vault.api.Auth;
15+
import io.github.jopenlibs.vault.json.JsonArray;
16+
import io.github.jopenlibs.vault.json.JsonObject;
1717
import java.io.ByteArrayInputStream;
1818
import java.io.IOException;
1919
import java.net.URI;

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/VaultAccessor.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
package com.datapipe.jenkins.vault;
22

3-
import com.bettercloud.vault.Vault;
4-
import com.bettercloud.vault.VaultConfig;
5-
import com.bettercloud.vault.VaultException;
6-
import com.bettercloud.vault.json.Json;
7-
import com.bettercloud.vault.json.JsonArray;
8-
import com.bettercloud.vault.json.JsonValue;
9-
import com.bettercloud.vault.response.LogicalResponse;
10-
import com.bettercloud.vault.response.VaultResponse;
11-
import com.bettercloud.vault.rest.RestResponse;
123
import com.cloudbees.plugins.credentials.CredentialsMatchers;
134
import com.cloudbees.plugins.credentials.CredentialsProvider;
145
import com.cloudbees.plugins.credentials.CredentialsUnavailableException;
@@ -24,6 +15,15 @@
2415
import hudson.Util;
2516
import hudson.model.Run;
2617
import hudson.security.ACL;
18+
import io.github.jopenlibs.vault.Vault;
19+
import io.github.jopenlibs.vault.VaultConfig;
20+
import io.github.jopenlibs.vault.VaultException;
21+
import io.github.jopenlibs.vault.json.Json;
22+
import io.github.jopenlibs.vault.json.JsonArray;
23+
import io.github.jopenlibs.vault.json.JsonValue;
24+
import io.github.jopenlibs.vault.response.LogicalResponse;
25+
import io.github.jopenlibs.vault.response.VaultResponse;
26+
import io.github.jopenlibs.vault.rest.RestResponse;
2727
import java.io.PrintStream;
2828
import java.io.Serializable;
2929
import java.nio.charset.StandardCharsets;
@@ -64,7 +64,7 @@ public VaultAccessor init() {
6464
config.build();
6565

6666
if (credential == null) {
67-
vault = new Vault(config);
67+
vault = Vault.create(config);
6868
} else {
6969
vault = credential.authorizeWithVault(config, policies);
7070
}

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/VaultDisposer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.datapipe.jenkins.vault;
22

3-
import com.bettercloud.vault.VaultConfig;
43
import com.datapipe.jenkins.vault.configuration.VaultConfiguration;
54
import com.datapipe.jenkins.vault.credentials.VaultCredential;
65
import hudson.FilePath;
76
import hudson.Launcher;
87
import hudson.model.Run;
98
import hudson.model.TaskListener;
9+
import io.github.jopenlibs.vault.VaultConfig;
1010
import java.io.IOException;
1111
import java.util.List;
1212
import jenkins.tasks.SimpleBuildWrapper;

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/configuration/VaultConfiguration.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.datapipe.jenkins.vault.configuration;
22

3-
import com.bettercloud.vault.SslConfig;
4-
import com.bettercloud.vault.VaultConfig;
5-
import com.bettercloud.vault.VaultException;
63
import com.cloudbees.plugins.credentials.common.StandardListBoxModel;
74
import com.cloudbees.plugins.credentials.domains.DomainRequirement;
85
import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
@@ -16,6 +13,9 @@
1613
import hudson.security.ACL;
1714
import hudson.util.ListBoxModel;
1815
import hudson.util.ListBoxModel.Option;
16+
import io.github.jopenlibs.vault.SslConfig;
17+
import io.github.jopenlibs.vault.VaultConfig;
18+
import io.github.jopenlibs.vault.VaultException;
1919
import java.io.Serializable;
2020
import java.util.List;
2121
import org.apache.commons.lang.StringUtils;

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/credentials/AbstractAuthenticatingVaultTokenCredential.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.datapipe.jenkins.vault.credentials;
22

3-
import com.bettercloud.vault.Vault;
4-
import com.bettercloud.vault.api.Auth;
53
import com.cloudbees.plugins.credentials.CredentialsScope;
64
import com.datapipe.jenkins.vault.exception.VaultPluginException;
75
import edu.umd.cs.findbugs.annotations.CheckForNull;
86
import edu.umd.cs.findbugs.annotations.NonNull;
97
import hudson.Util;
8+
import io.github.jopenlibs.vault.Vault;
9+
import io.github.jopenlibs.vault.api.Auth;
1010
import org.kohsuke.stapler.DataBoundSetter;
1111

1212
/**

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/credentials/AbstractVaultTokenCredential.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.datapipe.jenkins.vault.credentials;
22

3-
import com.bettercloud.vault.Vault;
4-
import com.bettercloud.vault.VaultConfig;
53
import com.cloudbees.plugins.credentials.CredentialsScope;
64
import com.cloudbees.plugins.credentials.impl.BaseStandardCredentials;
5+
import io.github.jopenlibs.vault.Vault;
6+
import io.github.jopenlibs.vault.VaultConfig;
77
import java.util.List;
88

99
public abstract class AbstractVaultTokenCredential
@@ -17,7 +17,7 @@ protected AbstractVaultTokenCredential(CredentialsScope scope, String id, String
1717

1818
@Override
1919
public Vault authorizeWithVault(VaultConfig config, List<String> policies) {
20-
Vault vault = new Vault(config);
21-
return new Vault(config.token(getToken(vault)));
20+
Vault vault = Vault.create(config);
21+
return Vault.create(config.token(getToken(vault)));
2222
}
2323
}

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/credentials/AbstractVaultTokenCredentialWithExpiration.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.datapipe.jenkins.vault.credentials;
22

3-
import com.bettercloud.vault.Vault;
4-
import com.bettercloud.vault.VaultConfig;
5-
import com.bettercloud.vault.VaultException;
6-
import com.bettercloud.vault.api.Auth;
7-
import com.bettercloud.vault.api.Auth.TokenRequest;
83
import com.cloudbees.plugins.credentials.CredentialsScope;
94
import com.datapipe.jenkins.vault.exception.VaultPluginException;
105
import edu.umd.cs.findbugs.annotations.CheckForNull;
116
import edu.umd.cs.findbugs.annotations.NonNull;
7+
import io.github.jopenlibs.vault.Vault;
8+
import io.github.jopenlibs.vault.VaultConfig;
9+
import io.github.jopenlibs.vault.VaultException;
10+
import io.github.jopenlibs.vault.api.Auth;
11+
import io.github.jopenlibs.vault.api.Auth.TokenRequest;
1212
import java.util.Calendar;
1313
import java.util.HashMap;
1414
import java.util.List;
@@ -133,7 +133,7 @@ public Vault authorizeWithVault(VaultConfig config, List<String> policies) {
133133
}
134134

135135
protected Vault getVault(VaultConfig config) {
136-
return new Vault(config);
136+
return Vault.create(config);
137137
}
138138

139139
private long getTokenTTL(Vault vault) throws VaultException {

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/credentials/VaultAppRoleCredential.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.datapipe.jenkins.vault.credentials;
22

3-
import com.bettercloud.vault.VaultException;
4-
import com.bettercloud.vault.api.Auth;
53
import com.cloudbees.plugins.credentials.CredentialsScope;
64
import com.datapipe.jenkins.vault.exception.VaultPluginException;
75
import edu.umd.cs.findbugs.annotations.CheckForNull;
86
import edu.umd.cs.findbugs.annotations.NonNull;
97
import hudson.Extension;
108
import hudson.Util;
119
import hudson.util.Secret;
10+
import io.github.jopenlibs.vault.VaultException;
11+
import io.github.jopenlibs.vault.api.Auth;
1212
import org.apache.commons.lang.StringUtils;
1313
import org.kohsuke.stapler.DataBoundConstructor;
1414

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/credentials/VaultAwsIamCredential.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.datapipe.jenkins.vault.credentials;
22

3-
import com.bettercloud.vault.api.Auth;
43
import com.cloudbees.plugins.credentials.CredentialsScope;
54
import com.datapipe.jenkins.vault.AwsHelper;
65
import edu.umd.cs.findbugs.annotations.CheckForNull;
76
import edu.umd.cs.findbugs.annotations.NonNull;
87
import hudson.Extension;
8+
import io.github.jopenlibs.vault.api.Auth;
99
import org.kohsuke.stapler.DataBoundConstructor;
1010
import org.kohsuke.stapler.DataBoundSetter;
1111

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/credentials/VaultCredential.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.datapipe.jenkins.vault.credentials;
22

3-
import com.bettercloud.vault.Vault;
4-
import com.bettercloud.vault.VaultConfig;
53
import com.cloudbees.plugins.credentials.CredentialsNameProvider;
64
import com.cloudbees.plugins.credentials.NameWith;
75
import com.cloudbees.plugins.credentials.common.StandardCredentials;
86
import edu.umd.cs.findbugs.annotations.NonNull;
7+
import io.github.jopenlibs.vault.Vault;
8+
import io.github.jopenlibs.vault.VaultConfig;
99
import java.io.Serializable;
1010
import java.util.List;
1111

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/credentials/VaultGCPCredential.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.datapipe.jenkins.vault.credentials;
22

3-
import com.bettercloud.vault.VaultException;
4-
import com.bettercloud.vault.api.Auth;
53
import com.cloudbees.plugins.credentials.CredentialsScope;
64
import com.datapipe.jenkins.vault.exception.VaultPluginException;
75
import edu.umd.cs.findbugs.annotations.CheckForNull;
86
import edu.umd.cs.findbugs.annotations.NonNull;
97
import hudson.Extension;
8+
import io.github.jopenlibs.vault.VaultException;
9+
import io.github.jopenlibs.vault.api.Auth;
1010
import java.io.BufferedReader;
1111
import java.io.IOException;
1212
import java.io.InputStreamReader;

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/credentials/VaultGithubTokenCredential.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.datapipe.jenkins.vault.credentials;
22

3-
import com.bettercloud.vault.VaultException;
4-
import com.bettercloud.vault.api.Auth;
53
import com.cloudbees.plugins.credentials.CredentialsScope;
64
import com.datapipe.jenkins.vault.exception.VaultPluginException;
75
import edu.umd.cs.findbugs.annotations.CheckForNull;
86
import edu.umd.cs.findbugs.annotations.NonNull;
97
import hudson.Extension;
108
import hudson.util.Secret;
9+
import io.github.jopenlibs.vault.VaultException;
10+
import io.github.jopenlibs.vault.api.Auth;
1111
import org.kohsuke.stapler.DataBoundConstructor;
1212
import org.kohsuke.stapler.DataBoundSetter;
1313

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/credentials/VaultKubernetesCredential.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.datapipe.jenkins.vault.credentials;
22

3-
import com.bettercloud.vault.VaultException;
4-
import com.bettercloud.vault.api.Auth;
53
import com.cloudbees.plugins.credentials.CredentialsScope;
64
import com.datapipe.jenkins.vault.exception.VaultPluginException;
75
import edu.umd.cs.findbugs.annotations.CheckForNull;
86
import edu.umd.cs.findbugs.annotations.NonNull;
97
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
108
import hudson.Extension;
9+
import io.github.jopenlibs.vault.VaultException;
10+
import io.github.jopenlibs.vault.api.Auth;
1111
import java.io.IOException;
1212
import java.nio.file.Files;
1313
import java.nio.file.Paths;

Diff for: ‎src/main/java/com/datapipe/jenkins/vault/credentials/VaultTokenCredential.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.datapipe.jenkins.vault.credentials;
22

3-
import com.bettercloud.vault.Vault;
43
import com.cloudbees.plugins.credentials.CredentialsScope;
54
import edu.umd.cs.findbugs.annotations.CheckForNull;
65
import edu.umd.cs.findbugs.annotations.NonNull;
76
import hudson.Extension;
87
import hudson.util.Secret;
8+
import io.github.jopenlibs.vault.Vault;
99
import org.kohsuke.stapler.DataBoundConstructor;
1010

1111
public class VaultTokenCredential extends AbstractVaultTokenCredential {

0 commit comments

Comments
 (0)