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 instance-identity as a plugin rather than a module #87

Merged
merged 1 commit into from Jul 29, 2022
Merged

Use instance-identity as a plugin rather than a module #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Open in desktop
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
View file
Open in desktop
@@ -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
View file
Open in desktop
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 />
Copy link
Member

Choose a reason for hiding this comment

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

BTW

Suggested change
<relativePath />
<relativePath/>

The extra space is superfluous in XML; but traditional browser HTML parsers required it for XHTML IIRC; and when using maven-release-plugin the crappy XML rewriting tool always reinserts it. JEP-229 avoids the problem by not mechanically editing the version POM.

Copy link
Member Author

Choose a reason for hiding this comment

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

The vast majority of our existing plugin POMs have the space so I was just following existing precedent. SortPom allows both conventions via the spaceBeforeCloseEmptyElement configuration option, which we've set to true in core to keep with existing precedent. Maybe someday when we run SortPom on more POMs that would be a good opportunity to clean this up globally.

</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