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-73775] Replace call to removed CommitBuilder.setEncoding(String) #2578

Merged
merged 2 commits into from
Sep 16, 2024
Merged

[JENKINS-73775] Replace call to removed CommitBuilder.setEncoding(String) #2578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
881f395
[JENKINS-73775] Replace call to removed CommitBuilder.setEncoding(Str…
MarkEWaite Sep 16, 2024
5e8f82c
Exclude org.eclipse.jgit from transitive inclusion
MarkEWaite Sep 16, 2024
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
7 changes: 7 additions & 0 deletions blueocean-git-pipeline/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@
<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
<!-- TODO this is hard to manage; if needed, should be in BOM -->
<version>6.9.0.202403050737-r</version>
<exclusions>
<!-- Exclude the jgit library because it is provided by git client plugin -->
<exclusion>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- test dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion ...cean-git-pipeline/src/main/java/io/jenkins/blueocean/blueocean_git_pipeline/GitUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ public static void commit(final Repository repo, final String refName, final Str
final CommitBuilder commit = new CommitBuilder();
commit.setAuthor(author);
commit.setCommitter(author);
commit.setEncoding(Constants.CHARACTER_ENCODING);
commit.setEncoding(StandardCharsets.UTF_8);
commit.setMessage(message);
//headId can be null if the repository has no commit yet
if (headId != null) {
Expand Down
Loading