Skip to content
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

Community/sghill/update parent #13

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Community/sghill/update parent #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
878245b
Modernize Plugin
sghill Jun 12, 2022
d223220
Merge branch 'community/sghill/update-parent' into upgrade-parent
itaibh Mar 14, 2023
eaaa0fd
Merge pull request #9 from sghill/upgrade-parent
itaibh Mar 14, 2023
bba9826
Merge branch 'master' into community/sghill/update-parent
itaibh Mar 14, 2023
508659a
Update pom.xml
itaibh Mar 14, 2023
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: 11 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,17 @@
<email>team@applitools.com</email>
</developer>
</developers>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.303.x</artifactId>
<version>1409.v7659b_c072f18</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencyManagement>
<dependencies>
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/com/applitools/jenkins/ApplitoolsEnvironmentExpander.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.applitools.jenkins;
import org.jenkinsci.plugins.workflow.steps.EnvironmentExpander;
import java.util.Map;
import java.util.HashMap;
import javax.annotation.Nonnull;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.EnvVars;
import org.jenkinsci.plugins.workflow.steps.EnvironmentExpander;

import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

/**
* Created by addihorowitz on 5/7/17.
Expand All @@ -19,7 +20,7 @@ public class ApplitoolsEnvironmentExpander extends EnvironmentExpander {
}

@Override
public void expand(@Nonnull EnvVars env) throws IOException, InterruptedException {
public void expand(@NonNull EnvVars env) throws IOException, InterruptedException {
env.overrideAll(overrides);
}
}
18 changes: 9 additions & 9 deletions src/main/java/com/applitools/jenkins/ApplitoolsStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package com.applitools.jenkins;
import com.google.inject.Inject;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.EnvVars;
import hudson.Extension;
import hudson.model.*;
import net.sf.json.JSONObject;
import org.jenkinsci.plugins.workflow.steps.*;
import org.kohsuke.stapler.DataBoundConstructor;
import hudson.Extension;
import org.kohsuke.stapler.StaplerRequest;
import org.jenkinsci.plugins.workflow.steps.AbstractStepExecutionImpl;
import org.jenkinsci.plugins.workflow.steps.AbstractStepImpl;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.StaplerRequest;

import java.io.IOException;
import java.util.HashMap;
import javax.annotation.Nonnull;
import com.google.inject.Inject;
import hudson.EnvVars;
import java.util.Collections;
import java.util.Map;
import java.util.HashMap;
import java.util.Set;

/**
* Created by addihorowitz on 5/7/17.
*/
Expand Down Expand Up @@ -105,7 +105,7 @@ public void closeBatch() {
}

@Override
public void stop(@Nonnull Throwable cause) throws Exception {
public void stop(@NonNull Throwable cause) throws Exception {
if (body!=null) {
body.cancel(cause);
}
Expand Down