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

[JENKINS-55582] [JEP-230] Split instance-identity to a plugin #6570

Closed
wants to merge 1 commit into from
Closed

[JENKINS-55582] [JEP-230] Split instance-identity to a plugin #6570

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,6 @@ THE SOFTWARE.
<artifactId>remoting</artifactId>
<version>${remoting.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>instance-identity</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions core/src/main/resources/jenkins/split-plugin-cycles.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,9 @@ jdk-tool jaxb
javax-activation-api javax-mail-api
javax-activation-api sshd
javax-mail-api sshd

# JENKINS-55582
bouncycastle-api instance-identity
bouncycastle-api sshd
javax-activation-api instance-identity
javax-mail-api instance-identity
3 changes: 3 additions & 0 deletions core/src/main/resources/jenkins/split-plugins.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ sshd 2.281 3.0.1

javax-activation-api 2.330 1.2.0-2
javax-mail-api 2.330 1.6.2-5

# JENKINS-55582
instance-identity 2.347 3.0.1
1 change: 0 additions & 1 deletion docs/MAINTAINERS.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ and hence the Jenkins core pull request review and merge process is more sophist
This document applies to the following components:

* Jenkins core
* Jenkins modules
* Libraries included into the Jenkins core
* Core components like Winstone, Executable WAR, etc.

Expand Down
6 changes: 6 additions & 0 deletions test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,12 @@ THE SOFTWARE.
<artifactId>test-annotations</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>instance-identity</artifactId>
<version>3.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>antisamy-markup-formatter</artifactId>
Expand Down
9 changes: 0 additions & 9 deletions test/src/test/java/jenkins/security/ClassFilterImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.BuildWatcher;
import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.LoggerRule;
import org.jvnet.hudson.test.TestExtension;
Expand Down Expand Up @@ -165,14 +164,6 @@ public void xstreamRequiresWhitelist() throws Exception {
assertThat(data.values().iterator().next().extra, allOf(containsString("LinkedListMultimap"), containsString("https://www.jenkins.io/redirect/class-filter/")));
}

@Test
@Issue("JENKINS-49543")
public void moduleClassesShouldBeWhitelisted() {
ClassFilterImpl filter = new ClassFilterImpl();
filter.check("org.jenkinsci.modules.windows_slave_installer.WindowsSlaveInstaller");
Copy link
Member

Choose a reason for hiding this comment

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

Oops, forgot about this, thanks.

filter.check("org.jenkinsci.main.modules.instance_identity.PageDecoratorImpl");
}

@TestExtension("xstreamRequiresWhitelist")
public static class Config extends GlobalConfiguration {
LinkedListMultimap<?, ?> obj;
Expand Down
12 changes: 7 additions & 5 deletions war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ THE SOFTWARE.
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>instance-identity</artifactId>
</dependency>
<dependency>
<!--
We bundle slf4j binding since we got some components (sshd for example)
Expand Down Expand Up @@ -415,7 +411,7 @@ THE SOFTWARE.
<artifactItem>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>sshd</artifactId>
<version>3.0.3</version>
<version>3.1.0</version>
Copy link
Member Author

Choose a reason for hiding this comment

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

Needed to avoid this error:

java.io.IOException: Failed to load: Jenkins GIT server Plugin (git-server 1.11)
 - Update required: SSH server (sshd 3.0.3) to be updated to 3.1.0 or higher
        at hudson.PluginWrapper.resolvePluginDependencies(PluginWrapper.java:994)
        at hudson.PluginManager.dynamicLoad(PluginManager.java:926)
Caused: java.io.IOException: Failed to install git-server plugin
        at hudson.PluginManager.dynamicLoad(PluginManager.java:940)
        at hudson.model.UpdateCenter$InstallationJob._run(UpdateCenter.java:2217)
Caused: java.io.IOException: Failed to dynamically deploy this plugin
        at hudson.model.UpdateCenter$InstallationJob._run(UpdateCenter.java:2221)
        at hudson.model.UpdateCenter$DownloadJob.run(UpdateCenter.java:1867)
        at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515)
        at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
        at hudson.remoting.AtmostOneThreadExecutor$Worker.run(AtmostOneThreadExecutor.java:121)
        at java.base/java.lang.Thread.run(Thread.java:829)

<type>hpi</type>
</artifactItem>
<artifactItem>
Expand All @@ -436,6 +432,12 @@ THE SOFTWARE.
<version>1.6.2-5</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>instance-identity</artifactId>
<version>3.0.1</version>
Copy link
Member

Choose a reason for hiding this comment

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

I think we want jenkinsci/instance-identity-plugin#21 released first. 3.0 & 3.0.1 should be considered broken.

Copy link
Member Author

Choose a reason for hiding this comment

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

A request made without reasoning. I will not accommodate such a request unless reasoning is provided.

<type>hpi</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/detached-plugins</outputDirectory>
<stripVersion>true</stripVersion>
Expand Down