Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into privateBuild-2023…
Browse files Browse the repository at this point in the history 
…0614
  • Loading branch information
@jimklimov
jimklimov committed Jun 14, 2023
2 parents 937dddc + d2a0aae commit 1462bb0
Show file tree
Hide file tree
Showing 123 changed files with 5,128 additions and 3,207 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ buildPlugin(
useContainerAgent: true,
// Show failures on all configurations
failFast: false,
// Test Java 11 with default release, Java 17 with more recent
// Test Java 11 with minimum Jenkins version, Java 17 with a more recent version
configurations: [
[platform: 'linux', jdk: '11'], // Linux first for coverage report on ci.jenkins.io
[platform: 'windows', jdk: '17', jenkins: '2.389']
[platform: 'windows', jdk: '17', jenkins: '2.407']
]
)
1 change: 1 addition & 0 deletions README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ security:
sshHostKeyVerificationStrategy:
manuallyProvidedKeyVerificationStrategy:
approvedHostKeys: |-
bitbucket.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIazEu89wgQZ4bqs3d63QSMzYVa0MuJ2e2gKTKqu+UUO
git.assembla.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+whKLd9tzS4IIbZD7rCgly2LNxlvxef4JvwSaL/YZ7
github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf
Expand Down
188 changes: 79 additions & 109 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.56</version>
<version>4.66</version>
<relativePath />
</parent>

Expand All @@ -13,14 +14,13 @@
<version>${revision}${changelist}</version>
<packaging>hpi</packaging>
<name>Jenkins Git client plugin</name>
<url>https://github.com/jenkinsci/git-client-plugin/blob/master/README.adoc</url>
<url>https://github.com/${gitHubRepo}</url>
<inceptionYear>2013</inceptionYear>

<licenses>
<license>
<name>The MIT License (MIT)</name>
<name>MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>

Expand Down Expand Up @@ -50,65 +50,54 @@
</developer>
</developers>

<scm>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
<connection>scm:git:https://github.com/${gitHubRepo}</connection>
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
<tag>${scmTag}</tag>
<url>https://github.com/${gitHubRepo}</url>
</scm>

<properties>
<revision>4.2.1</revision>
<revision>4.4.1</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<!-- Character set tests fail unless file.encoding is set -->
<argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
<jenkins.version>2.361.4</jenkins.version>
<jgit.version>6.5.0.202303070854-r</jgit.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.version>2.387.3</jenkins.version>
<jgit.version>6.6.0.202305301015-r</jgit.version>
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Medium</spotbugs.threshold>
<spotless.check.skip>false</spotless.check.skip>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.361.x</artifactId>
<version>1935.v530f4395930f</version>
<artifactId>bom-2.387.x</artifactId>
<version>2163.v2d916d90c305</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Resolve dependency management warning from enforcer in parent pom 4.55 -->
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.2</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<!-- Use httpclient plugin rather than JGit transitive dependency inclusion of Apache httpclient -->
<!-- This must be listed before its consumers -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>apache-httpcomponents-client-4-api</artifactId>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<!-- Use mina api common plugin rather than JGit transitive dependency inclusion of Apache Mina sshd common -->
<!-- This must be listed before its consumers -->
<groupId>io.jenkins.plugins.mina-sshd-api</groupId>
<artifactId>mina-sshd-api-common</artifactId>
</dependency>
<dependency>
<!-- Use mina api core plugin rather than JGit transitive dependency inclusion of Apache Mina sshd core -->
<!-- This must be listed before its consumers -->
<groupId>io.jenkins.plugins.mina-sshd-api</groupId>
<artifactId>mina-sshd-api-core</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>trilead-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
Expand All @@ -121,6 +110,24 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- Include jgit's Apache HTTP client so that we can avoid
automatic NTLM on Windows. See JENKINS-37934 -->
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
<version>${jgit.version}</version>
<exclusions>
<!-- Provided by apache-httpcomponents-client-4-api plugin -->
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- Include jgit http server so that git-userContent and other
plugins can depend on git-client-plugin rather than
Expand All @@ -130,13 +137,6 @@
<artifactId>org.eclipse.jgit.http.server</artifactId>
<version>${jgit.version}</version>
</dependency>
<dependency>
<!-- Include jgit's Apache HTTP client so that we can avoid
automatic NTLM on Windows. See JENKINS-37934 -->
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
<version>${jgit.version}</version>
</dependency>
<dependency>
<!-- Include jgit's LFS module for eventual large file support -->
<groupId>org.eclipse.jgit</groupId>
Expand All @@ -148,6 +148,11 @@
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
<version>${jgit.version}</version>
<exclusions>
<exclusion>
<!-- Prevent inclusion of transitive dependency -->
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
</exclusion>
<exclusion>
<!-- Prevent inclusion of transitive dependency, OSGi not needed by git client plugin -->
<groupId>org.apache.sshd</groupId>
Expand All @@ -158,11 +163,6 @@
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
</exclusion>
<exclusion>
<!-- Prevent inclusion of transitive dependency -->
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
</exclusion>
<exclusion>
<!-- provided by jenkins-core -->
<groupId>org.slf4j</groupId>
Expand All @@ -171,51 +171,50 @@
</exclusions>
</dependency>
<dependency>
<!-- Use httpclient plugin rather than JGit transitive dependency inclusion of Apache httpclient -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<artifactId>apache-httpcomponents-client-4-api</artifactId>
</dependency>
<dependency>
<!-- Credentials test requires scm-api -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<scope>test</scope>
<artifactId>credentials</artifactId>
</dependency>
<dependency>
<!-- Tests require the scm-api-tests jar -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
<artifactId>script-security</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<artifactId>ssh-credentials</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>trilead-api</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>3.14.1</version>
<groupId>io.jenkins.configuration-as-code</groupId>
<artifactId>test-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git-server</artifactId>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>3.14.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -226,27 +225,31 @@
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
<artifactId>git-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>3.3</version>
<!-- Credentials test requires scm-api -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<!-- Tests require the scm-api-tests jar -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<artifactId>scm-api</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<!-- JCasC compatibility -->
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<optional>true</optional>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.jenkins.configuration-as-code</groupId>
<artifactId>test-harness</artifactId>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>3.3</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -262,6 +265,7 @@
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
Expand All @@ -270,40 +274,6 @@
</pluginRepositories>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.35.0</version>
<configuration>
<!-- define a language-specific format -->
<java>
<!-- no need to specify files, inferred automatically -->
<endWithNewline />
<removeUnusedImports />
</java>
<pom>
<sortPom>
<encoding>${project.build.sourceEncoding}</encoding>
<lineSeparator>\n</lineSeparator>
<expandEmptyElements>false</expandEmptyElements>
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
</sortPom>
</pom>
</configuration>
<executions>
<execution>
<!-- Runs in verify phase by default -->
<goals>
<!-- Can be disabled using -Dspotless.check.skip -->
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/hudson/plugins/git/Branch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ public boolean equals(Object obj) {
return false;
}
final Branch other = (Branch) obj;
return Objects.equals(this.name, other.name)
&& Objects.equals(this.sha1, other.sha1);
return Objects.equals(this.name, other.name) && Objects.equals(this.sha1, other.sha1);
}
}
Loading

0 comments on commit 1462bb0

Please sign in to comment.