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.

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

Do not bundle a copy of instance-identity #75

Merged
merged 1 commit into from
May 19, 2022

Conversation

jglick
Copy link
Member

@jglick jglick commented May 19, 2022

#38 was incorrect. Noticed when trying to test jenkinsci/jenkins#6585 that even when instance-identity is not enabled as a plugin, InstanceIdentityRSAProvider gets loaded from plugins/sshd/WEB-INF/lib/instance-identity-2.2.jar.

@jglick jglick added the bug label May 19, 2022
@@ -32,21 +32,8 @@
<revision>3</revision>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.289.1</jenkins.version>
<java.level>8</java.level>
Copy link
Member Author

Choose a reason for hiding this comment

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

since we are on 4.40

<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.277.x</artifactId>
Copy link
Member Author

Choose a reason for hiding this comment

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

Wrong line (the dep is 2.289.x) and anyway this currently has no plugin deps so there is no need for a BOM.

@@ -72,7 +59,7 @@
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>instance-identity</artifactId>
<version>2.2</version> <!-- We use the module for the moment -->
Copy link
Member Author

Choose a reason for hiding this comment

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

Picking up version from core BOM.

@@ -72,7 +59,7 @@
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>instance-identity</artifactId>
<version>2.2</version> <!-- We use the module for the moment -->
<scope>provided</scope> <!-- TODO pending JEP-230 we use the module -->
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 main fix—do not include this JAR in WEB-INF/lib/!

@jglick jglick merged commit ed5e1bc into jenkinsci:main May 19, 2022
@jglick jglick deleted the instance-identity branch May 19, 2022 17:46
Copy link
Contributor

@kuisathaverat kuisathaverat left a comment

Choose a reason for hiding this comment

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

LGTM

jglick added a commit to jglick/jenkins that referenced this pull request May 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants