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

No need to bundle jsch.jar #47

Merged
merged 1 commit into from
Feb 28, 2018
Merged

No need to bundle jsch.jar #47

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: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
</scm>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>jsch</artifactId>
<version>0.1.54.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.lib</groupId>
<artifactId>cvsclient</artifactId>
Copy link
Member

Choose a reason for hiding this comment

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

Would it it make sense to explicitly add an exclusion here? Otherwise we may still have an issue with bundling of the library dependencies after the patch

Copy link
Member Author

Choose a reason for hiding this comment

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

Should not be necessary:

  • requireUpperBoundsDeps already enforces that the desired version is selected. (For example, if you swap the order of the two explicit deps, the build fails.)
  • I manually verified that cvs.hpi contained jsch.jar before but not after this patch.

Copy link
Member

Choose a reason for hiding this comment

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

Will it also exclude transient deps in such case. E.g. if the previous jsch library includes foo.bar which is no longer bundled in 0.1.54

Copy link
Member Author

Choose a reason for hiding this comment

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

It should, but anyway there are no such dependencies.

Copy link
Member Author

Choose a reason for hiding this comment

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

Specifically mvn:dependency-tree:

--- before	2018-02-28 15:46:22.539439704 -0500
+++ after	2018-02-28 15:46:31.043479035 -0500
@@ -1,6 +1,11 @@
 [INFO] org.jenkins-ci.plugins:cvs:hpi:2.14-SNAPSHOT
+[INFO] +- org.jenkins-ci.plugins:jsch:jar:0.1.54.2:compile
+[INFO] |  +- com.jcraft:jsch:jar:0.1.54:compile
+[INFO] |  \- org.jenkins-ci.plugins:ssh-credentials:jar:1.13:compile
+[INFO] |     \- org.jenkins-ci.plugins:credentials:jar:2.1.0:compile
+[INFO] |        \- org.antlr:antlr4-runtime:jar:4.5:compile
+[INFO] |           \- org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1:compile
 [INFO] +- org.jenkins-ci.lib:cvsclient:jar:71-jenkins-11:compile
-[INFO] |  \- com.jcraft:jsch:jar:0.1.50:compile
 [INFO] +- org.reflections:reflections:jar:0.9.9:test
 [INFO] |  +- com.google.guava:guava:jar:15.0:provided
 [INFO] |  \- org.javassist:javassist:jar:3.18.2-GA:test

Expand Down