Skip to content

Commit

Permalink
Merge pull request #88 from jenkinsci/instance-identity
Browse files Browse the repository at this point in the history
Use `instance-identity` as a plugin rather than a module
  • Loading branch information
jglick authored Jul 28, 2022
2 parents ba6e97d + 641710d commit 2dc2ea4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
5 changes: 4 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
// Builds a module using https://github.com/jenkins-infra/pipeline-library
buildPlugin()
buildPlugin(useContainerAgent: true, configurations: [
[ platform: 'linux', jdk: '11' ],
[ platform: 'windows', jdk: '11' ],
])
16 changes: 9 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?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>
<version>4.43.1</version>
<version>4.44</version>
<relativePath />
</parent>

Expand All @@ -15,9 +16,9 @@
<description>Adds SSH server functionality to Jenkins, exposing CLI commands through it</description>

<scm>
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:ssh://git@github.com/jenkinsci/${project.artifactId}-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
<url>https://github.com/${gitHubRepo}</url>
<tag>${scmTag}</tag>
</scm>

Expand All @@ -31,14 +32,15 @@
<properties>
<revision>3</revision>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.289.1</jenkins.version>
<jenkins.version>2.357</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
</properties>

<dependencies>
<dependency>
<groupId>io.jenkins.plugins.mina-sshd-api</groupId>
<artifactId>mina-sshd-api-core</artifactId>
<version>2.8.0-21.v493b_6b_db_22c6</version>
<version>2.8.0-36.v8e25ce90d4b_1</version>
</dependency>
<dependency>
<groupId>net.i2p.crypto</groupId>
Expand All @@ -48,7 +50,7 @@
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>instance-identity</artifactId>
<scope>provided</scope> <!-- TODO pending JEP-230 we use the module -->
<version>116.vf8f487400980</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
Expand Down

0 comments on commit 2dc2ea4

Please sign in to comment.