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

Fix scope for some git plugin transitive dependencies getting pulled as 'compile' instead of 'test' #592

Merged
merged 3 commits into from
Sep 10, 2019
Merged

Fix scope for some git plugin transitive dependencies getting pulled as 'compile' instead of 'test' #592

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1008cf2
Fix scope for some git plugin transitive dependencies getting pulled as
Vlatombe Sep 9, 2019
09b29c3
Exclude some transitive test dependencies to workaround a packaging p…
Vlatombe Sep 9, 2019
5a8a7a6
Restore sshd-core exclusion
Vlatombe Sep 9, 2019
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
35 changes: 27 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,34 @@
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<scope>test</scope>
<exclusions>
<!-- Already included through pipeline-model-extensions and causing them to be packaged -->
<exclusion>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
</exclusion>
<exclusion>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
<exclusions>
<!-- Already included through pipeline-model-extensions and causing them to be packaged -->
<exclusion>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
</exclusion>
<exclusion>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -174,10 +196,14 @@
<version>1.17</version>
<scope>test</scope>
<exclusions>
<exclusion> <!-- pluginFirstClassLoader, and anyway kroniak/ssh-client includes /usr/bin/ssh-agent so JVM client is unused -->
<exclusion>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -248,13 +274,6 @@
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<configuration>
<!-- with the default setting seems that an older version of jackson from core is used
java.lang.NoSuchMethodError: com.fasterxml.jackson.core.JsonFactory.requiresPropertyOrdering()Z
at com.fasterxml.jackson.databind.ObjectMapper.<init>(ObjectMapper.java:549)
at com.fasterxml.jackson.databind.ObjectMapper.<init>(ObjectMapper.java:460)
at io.fabric8.kubernetes.client.utils.Serialization.<clinit>(Serialization.java:37)
-->
<pluginFirstClassLoader>true</pluginFirstClassLoader>
Copy link
Member

Choose a reason for hiding this comment

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

Be sure to test this live, not just mvn hpi:run.

Copy link
Member Author

Choose a reason for hiding this comment

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

Didn't see any problem. Looking at the git blame for this, I see this was added back in the day where jackson was packaged directly in the plugin.

<systemProperties>
<hudson.slaves.NodeProvisioner.initialDelay>0</hudson.slaves.NodeProvisioner.initialDelay>
<hudson.slaves.NodeProvisioner.MARGIN>50</hudson.slaves.NodeProvisioner.MARGIN>
Expand Down