Skip to content

Commit

Permalink
Merge pull request #87 from basil/refresh
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 committed Jul 29, 2022
2 parents 05314a9 + 11f3397 commit a24191b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Expand Up @@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.3</version>
<version>1.4</version>
</extension>
</extensions>
9 changes: 4 additions & 5 deletions Jenkinsfile
@@ -1,5 +1,4 @@
def configurations = [
[ platform: "linux", jdk: "8" ],
[ platform: "linux", jdk: "11" ]
]
buildPlugin(configurations: configurations)
buildPlugin(useContainerAgent: true, configurations: [
[ platform: 'linux', jdk: '11' ],
[ platform: 'windows', jdk: '11' ],
])
12 changes: 6 additions & 6 deletions pom.xml
Expand Up @@ -4,7 +4,8 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.40</version>
<version>4.44</version>
<relativePath />
</parent>

<artifactId>git-server</artifactId>
Expand All @@ -20,7 +21,7 @@
<properties>
<revision>1.12</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.289.3</jenkins.version>
<jenkins.version>2.357</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
</properties>

Expand All @@ -43,8 +44,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.289.x</artifactId>
<version>987.v4ade2e49fe70</version>
<artifactId>bom-2.346.x</artifactId>
<version>1554.v77b_8d3b_46a_37</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -55,8 +56,7 @@
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>instance-identity</artifactId>
<version>2.2</version>
<scope>provided</scope>
<version>116.vf8f487400980</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
Expand Down

0 comments on commit a24191b

Please sign in to comment.