Skip to content

Handle new guava version (vendor class) #85

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

Merged
bitwiseman merged 6 commits into from
Mar 16, 2021
Merged

Handle new guava version (vendor class) #85

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b1a358
Handle new guava version (vendor class)
timja Mar 14, 2021
2a34f19
Move to impl
timja Mar 15, 2021
14b5abd
Merge branch 'master' into handle-new-guava
timja Mar 15, 2021
783b982
Switch to reflection too much to vendor
timja Mar 15, 2021
fa18e45
Bump baseline, remove pointless test breaking CI
timja Mar 16, 2021
ed691bb
Remove other test
timja Mar 16, 2021
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
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.1</version>
<version>4.17</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -67,7 +67,7 @@
<properties>
<revision>2.6.5</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.176.4</jenkins.version>
<jenkins.version>2.222.4</jenkins.version>
<java.level>8</java.level>
<no-test-jar>false</no-test-jar>
<hpi.compatibleSinceVersion>2.0.0</hpi.compatibleSinceVersion>
Expand All @@ -90,8 +90,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.176.x</artifactId>
<version>9</version>
<artifactId>bom-2.222.x</artifactId>
<version>26</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/jenkins/scm/api/SCMName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

package jenkins.scm.api;

import com.google.common.net.InternetDomainName;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.net.IDN;
Expand All @@ -33,6 +32,8 @@
import java.util.Arrays;
import java.util.List;
import java.util.Locale;

import jenkins.scm.impl.InternetDomainName;
import org.apache.commons.lang.StringUtils;

/**
Expand Down Expand Up @@ -142,10 +143,10 @@ private static String resolveInternetDomainName(String hostName) {
}

if (host.hasPublicSuffix()) {
final String publicName = host.publicSuffix().name();
return StringUtils.removeEnd(StringUtils.removeEnd(host.name(), publicName), ".").toLowerCase(Locale.ENGLISH);
final String publicName = host.publicSuffix().toString();
return StringUtils.removeEnd(StringUtils.removeEnd(host.toString(), publicName), ".").toLowerCase(Locale.ENGLISH);
}

return StringUtils.removeEnd(host.name(), ".").toLowerCase(Locale.ENGLISH);
return StringUtils.removeEnd(host.toString(), ".").toLowerCase(Locale.ENGLISH);
}
}
Loading