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

Use BOM and dependabot #37

Merged
merged 9 commits into from
Feb 7, 2021
Merged

Use BOM and dependabot #37

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fd8795e
Use BOM
rantoniuk Oct 27, 2020
5a7c192
Bump BOM to 16
rantoniuk Oct 27, 2020
eab6a06
Add dependabot config
rantoniuk Oct 27, 2020
da74e8e
Add comment for build plugin
rantoniuk Oct 27, 2020
402a6d7
Update pom.xml
warden Oct 27, 2020
d5390e7
Unused test dependencies cleanup
rantoniuk Oct 27, 2020
ea0837e
Merge branch 'bom' of github.com:warden/ssh-agent-plugin into bom
rantoniuk Oct 27, 2020
0a5c515
Remove maintainers from pom to avoid confusion
rantoniuk Dec 28, 2020
48a5d95
Bump bom
rantoniuk Dec 28, 2020
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 .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "monthly"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
2 changes: 2 additions & 0 deletions .mvn/maven.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-Pconsume-incrementals
-Pmight-produce-incrementals
71 changes: 15 additions & 56 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.24</version>
<version>4.12</version>
<relativePath />
</parent>

<artifactId>ssh-agent</artifactId>
<version>1.21-SNAPSHOT</version>
<version>${revision}${changelist}</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you use mvn incrementals:incrementalify? You forgot to commit the .mvn/ directory if so.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still missing .mvn/extensions.xml.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to add that one file instead of commenting 2y old already merged PR ;-)
At the same time, might be just as well good to consider adding this file globally to all repositories under /jenkinsci org - I don't think it would harm them even if they're not using incrementals at the moment?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to add that one file

Already done in #85.

consider adding this file globally to all repositories

Could, but probably more confusing than helpful, since mvn incrementals:incrementalify expects to add it.

<packaging>hpi</packaging>

<name>SSH Agent Plugin</name>
Expand All @@ -59,13 +59,15 @@
<connection>scm:git:git://github.com/jenkinsci/ssh-agent-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/ssh-agent-plugin.git</developerConnection>
<url>http://github.com/jenkinsci/ssh-agent-plugin</url>
<tag>HEAD</tag>
<tag>${scmTag}</tag>
</scm>

<properties>
<jenkins.version>2.60.3</jenkins.version>
<revision>1.21</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/ssh-agent-plugin</gitHubRepo>
<jenkins.version>2.222.4</jenkins.version>
<java.level>8</java.level>
<workflow-support-plugin.version>2.18</workflow-support-plugin.version>
</properties>

<repositories>
Expand All @@ -86,7 +88,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>1.3.0</version>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
Expand All @@ -101,19 +103,16 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
<version>2.16</version>
</dependency>

<!-- plugin dependencies -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>2.1.17</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
<version>1.14</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -122,46 +121,19 @@
</dependency>
<!-- jenkins dependencies -->
<!-- test dependencies -->
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-api</artifactId>
<version>2.27</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>2.12.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-basic-steps</artifactId>
jglick marked this conversation as resolved.
Show resolved Hide resolved
<version>2.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-durable-task-step</artifactId>
jglick marked this conversation as resolved.
Show resolved Hide resolved
<version>2.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>2.45</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
rantoniuk marked this conversation as resolved.
Show resolved Hide resolved
<version>${workflow-support-plugin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>${workflow-support-plugin.version}</version>
<classifier>tests</classifier>
rantoniuk marked this conversation as resolved.
Show resolved Hide resolved
<scope>test</scope>
</dependency>
Expand All @@ -175,33 +147,20 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.14</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>symbol-annotation</artifactId>
<version>1.14</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1.44</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>2.2.7</version>
<scope>test</scope>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.222.x</artifactId>
<version>16</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<!-- critical because sshd needs to be loaded first, otherwise will just bail out -->
<!-- https://www.jenkins.io/doc/developer/plugin-development/dependencies-and-class-loading/ -->
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<extensions>true</extensions>
Expand Down