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

Jump to bottom

Require Jenkins 2.452.4 or newer #135

Merged
merged 4 commits into from
Oct 31, 2024
Merged

Require Jenkins 2.452.4 or newer #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96fe396
Use standard dependabot configuration and format
MarkEWaite Oct 31, 2024
3029c6b
Require Jenkins 2.452.4 or newer
MarkEWaite Oct 31, 2024
be4ce87
Use 0.10.0 as next release
MarkEWaite Oct 31, 2024
37aab88
Remove description attribute from pom
MarkEWaite Oct 31, 2024
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
20 changes: 10 additions & 10 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
---
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates

version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
- package-ecosystem: maven
directory: /
schedule:
interval: monthly
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
11 changes: 6 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
Expand All @@ -13,7 +14,6 @@
<version>${revision}${changelist}</version>
<packaging>hpi</packaging>
<name>Git Parameter Plug-In</name>
<description>Adds ability to choose branches, tags or revisions from git repositories configured in project.</description>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>

<licenses>
Expand Down Expand Up @@ -48,10 +48,11 @@
</scm>

<properties>
<revision>0.9.20</revision>
<revision>0.10.0</revision>
<changelist>-SNAPSHOT</changelist>
<!-- Baseline Jenkins version you use to build and test the plugin. Users must have this version or newer to run. -->
<jenkins.version>2.387.3</jenkins.version>
<jenkins.baseline>2.452</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.4</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<spotless.check.skip>false</spotless.check.skip>
</properties>
Expand All @@ -60,8 +61,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.387.x</artifactId>
<version>2543.vfb_1a_5fb_9496d</version>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>3559.vb_5b_81183b_d23</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutionException;
import net.sf.json.JSONObject;
import net.uaznia.lukanus.hudson.plugins.gitparameter.GitParameterDefinition.DescriptorImpl;
import net.uaznia.lukanus.hudson.plugins.gitparameter.jobs.JobWrapper;
Expand Down Expand Up @@ -701,7 +700,7 @@ public void testWorkflowJobWithCpsScmFlowDefinition() throws IOException {
}

@Test
public void testWorkflowJobWithCpsFlowDefinition() throws IOException, InterruptedException, ExecutionException {
public void testWorkflowJobWithCpsFlowDefinition() throws Exception {
WorkflowJob p = jenkins.createProject(WorkflowJob.class, "wfj");
String script =
"node {\n" + " git url: '" + GIT_PARAMETER_REPOSITORY_URL + "' \n" + " echo 'Some message'\n" + "}";
Expand Down