Skip to content

Replace Apache Commons Lang 2 with Commons Lang 3 #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonesbusy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace Apache Commons Lang 2 with Commons Lang 3 #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.80</version>
<version>6.2116.v7501b_67dc517</version>
<relativePath />
</parent>
<groupId>de.taimos</groupId>
Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>2928.ved44ea_84e034</version>
<version>5054.v620b_5d2b_d5e6</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -79,9 +79,10 @@
<revision>1.46</revision>
<changelist>-SNAPSHOT</changelist>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.414</jenkins.baseline>
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
</properties>
<build>
<plugins>
Expand Down Expand Up @@ -194,6 +195,10 @@
<groupId>io.jenkins.plugins</groupId>
<artifactId>snakeyaml-api</artifactId>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>commons-lang3-api</artifactId>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/taimos/pipeline/aws/AWSClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import hudson.EnvVars;
import hudson.FilePath;
import hudson.model.TaskListener;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.jenkinsci.plugins.workflow.steps.StepContext;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/de/taimos/pipeline/aws/cloudformation/CloudFormationStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

package de.taimos.pipeline.aws.cloudformation;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import com.amazonaws.services.cloudformation.AmazonCloudFormation;
import com.amazonaws.services.cloudformation.model.AmazonCloudFormationException;
import com.amazonaws.services.cloudformation.model.Capability;
Expand Down Expand Up @@ -121,6 +122,7 @@ public Map<String, String> describeOutputs() {
return map;
}

@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE") // Lombok getTimeout() check
public Map<String, String> create(String templateBody, String templateUrl, Collection<Parameter> params, Collection<Tag> tags, Collection<String> notificationARNs, PollConfiguration pollConfiguration, String roleArn, String onFailure, Boolean enableTerminationProtection) throws ExecutionException {
if ((templateBody == null || templateBody.isEmpty()) && (templateUrl == null || templateUrl.isEmpty())) {
throw new IllegalArgumentException("Either a file or url for the template must be specified");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/de/taimos/pipeline/aws/cloudformation/EventPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import java.util.List;
import java.util.concurrent.ExecutionException;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.concurrent.BasicFuture;

import com.amazonaws.AmazonWebServiceRequest;
Expand All @@ -50,7 +50,7 @@
import de.taimos.pipeline.aws.cloudformation.utils.TimeOutRetryStrategy;
import hudson.model.TaskListener;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.concurrent.BasicFuture;

import java.text.SimpleDateFormat;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/de/taimos/pipeline/aws/cloudformation/PollConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package de.taimos.pipeline.aws.cloudformation;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import lombok.Builder;
import lombok.NonNull;
import lombok.Value;

import java.time.Duration;

@Value
@Builder(toBuilder = true)
@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE") // Lombok @NonNull check
public class PollConfiguration {

public static final PollConfiguration DEFAULT = builder()
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/taimos/pipeline/aws/code/deploy/CreateDeployStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import hudson.Extension;
import hudson.model.TaskListener;
import lombok.Getter;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.jenkinsci.plugins.workflow.steps.Step;
import org.jenkinsci.plugins.workflow.steps.StepContext;
import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/de/taimos/pipeline/aws/RoleSessionNameBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void shortNamesAreNotStripped() {

@Test
public void nameLongerThanAWSLimitAreStripped() {
String jobName = org.apache.commons.lang.StringUtils.repeat("s", 64);
String jobName = org.apache.commons.lang3.StringUtils.repeat("s", 64);
String buildNumber = "123";
final RoleSessionNameBuilder roleSessionNameBuilder = RoleSessionNameBuilder.withJobName(jobName)
.withBuildNumber(buildNumber);
Expand All @@ -49,7 +49,7 @@ public void nameLongerThanAWSLimitAreStripped() {

@Test
public void nameEqualToAWSLimitAreStripped() {
String jobName = org.apache.commons.lang.StringUtils.repeat("s", 52);
String jobName = org.apache.commons.lang3.StringUtils.repeat("s", 52);
String buildNumber = "123";
final RoleSessionNameBuilder roleSessionNameBuilder = RoleSessionNameBuilder.withJobName(jobName)
.withBuildNumber(buildNumber);
Expand Down
Loading