Skip to content

Commit 33e6157

Browse files
ashwanthkumarashwanthkumar
authored
Merge pull request #179 from chadlwilson/upgrade-deps
Upgrade dependencies to latest versions
2 parents 6b48a30 + 1cff5c1 commit 33e6157

18 files changed

Lines changed: 118 additions & 171 deletions

File tree

‎pom.xml‎

Lines changed: 76 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -9,118 +9,147 @@
99

1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<go.version>14.4.0</go.version>
12+
<go.compat.version>18.10.0</go.compat.version>
1313
<main.dir>${project.basedir}</main.dir>
1414
</properties>
1515

16+
<dependencyManagement>
17+
<dependencies>
18+
<!-- From git-cmd -->
19+
<dependency>
20+
<groupId>org.apache.commons</groupId>
21+
<artifactId>commons-exec</artifactId>
22+
<version>1.4.0</version>
23+
</dependency>
24+
<!-- From Github and Gitlab API -->
25+
<dependency>
26+
<groupId>com.fasterxml.jackson</groupId>
27+
<artifactId>jackson-bom</artifactId>
28+
<version>2.16.1</version>
29+
<scope>import</scope>
30+
<type>pom</type>
31+
</dependency>
32+
<!-- From Gitlab API -->
33+
<dependency>
34+
<groupId>commons-codec</groupId>
35+
<artifactId>commons-codec</artifactId>
36+
<version>1.17.0</version>
37+
</dependency>
38+
</dependencies>
39+
</dependencyManagement>
40+
1641
<dependencies>
1742
<dependency>
1843
<groupId>cd.go.plugin</groupId>
1944
<artifactId>go-plugin-api</artifactId>
20-
<version>${go.version}</version>
45+
<version>23.5.0</version>
2146
<scope>provided</scope>
2247
</dependency>
48+
<dependency>
49+
<groupId>commons-io</groupId>
50+
<artifactId>commons-io</artifactId>
51+
<version>2.16.1</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.apache.commons</groupId>
55+
<artifactId>commons-lang3</artifactId>
56+
<version>3.14.0</version>
57+
</dependency>
2358
<dependency>
2459
<groupId>in.ashwanthkumar</groupId>
2560
<artifactId>git-cmd</artifactId>
26-
<version>1.4</version>
61+
<version>2.0</version>
62+
<exclusions>
63+
<!-- The plugin does not use JGit impl -->
64+
<exclusion>
65+
<groupId>org.eclipse.jgit</groupId>
66+
<artifactId>org.eclipse.jgit</artifactId>
67+
</exclusion>
68+
</exclusions>
2769
</dependency>
2870
<dependency>
2971
<groupId>com.google.code.gson</groupId>
3072
<artifactId>gson</artifactId>
31-
<version>2.3.1</version>
73+
<version>2.10.1</version>
3274
</dependency>
3375
<dependency>
3476
<groupId>in.ashwanthkumar</groupId>
3577
<artifactId>my-java-utils</artifactId>
36-
<version>0.0.6</version>
78+
<version>0.1.0</version>
3779
</dependency>
3880
<dependency>
3981
<groupId>org.kohsuke</groupId>
4082
<artifactId>github-api</artifactId>
41-
<version>1.128</version>
83+
<version>1.321</version>
84+
<scope>provided</scope>
4285
</dependency>
4386
<dependency>
4487
<groupId>org.gitlab4j</groupId>
4588
<artifactId>gitlab4j-api</artifactId>
46-
<version>4.15.6</version>
47-
</dependency>
48-
<dependency>
49-
<groupId>com.fasterxml.jackson.core</groupId>
50-
<artifactId>jackson-core</artifactId>
51-
<version>2.9.3</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>com.fasterxml.jackson.core</groupId>
55-
<artifactId>jackson-databind</artifactId>
56-
<version>2.9.10.7</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>com.fasterxml.jackson.core</groupId>
60-
<artifactId>jackson-annotations</artifactId>
61-
<version>2.9.3</version>
89+
<version>5.5.0</version>
90+
<scope>provided</scope>
6291
</dependency>
6392

64-
6593
<dependency>
6694
<groupId>org.mockito</groupId>
6795
<artifactId>mockito-core</artifactId>
68-
<version>1.8.5</version>
96+
<version>5.11.0</version>
6997
<scope>test</scope>
70-
<exclusions>
71-
<exclusion>
72-
<groupId>org.hamcrest</groupId>
73-
<artifactId>hamcrest-core</artifactId>
74-
</exclusion>
75-
</exclusions>
7698
</dependency>
7799
<dependency>
78100
<groupId>junit</groupId>
79101
<artifactId>junit</artifactId>
80-
<version>4.13.1</version>
102+
<version>4.13.2</version>
81103
<scope>test</scope>
82104
</dependency>
83105
<dependency>
84106
<groupId>org.hamcrest</groupId>
85-
<artifactId>hamcrest-all</artifactId>
86-
<version>1.3</version>
107+
<artifactId>hamcrest</artifactId>
108+
<version>2.2</version>
87109
<scope>test</scope>
88110
</dependency>
89-
90-
<dependency>
91-
<groupId>commons-lang</groupId>
92-
<artifactId>commons-lang</artifactId>
93-
<version>2.6</version>
94-
</dependency>
95111
</dependencies>
96112

97113
<repositories>
98114
<repository>
99115
<id>sonatype</id>
100116
<url>https://oss.sonatype.org/content/repositories/releases/</url>
101117
</repository>
118+
<repository>
119+
<id>maven_central</id>
120+
<name>Maven Central</name>
121+
<url>https://repo.maven.apache.org/maven2/</url>
122+
</repository>
102123
</repositories>
103124

104125
<profiles>
105126
<profile>
106127
<id>github.pr</id>
107-
<activation>
108-
<activeByDefault>true</activeByDefault>
109-
</activation>
110128
<properties>
111129
<plugin.name>github-pr-poller</plugin.name>
112130
<resource.directory>src/main/resources/github</resource.directory>
113131
</properties>
132+
<dependencies>
133+
<dependency>
134+
<groupId>org.kohsuke</groupId>
135+
<artifactId>github-api</artifactId>
136+
<version>1.321</version>
137+
</dependency>
138+
</dependencies>
114139
</profile>
115140
<profile>
116141
<id>gitlab.pr</id>
117-
<activation>
118-
<activeByDefault>true</activeByDefault>
119-
</activation>
120142
<properties>
121143
<plugin.name>gitlab-pr-poller</plugin.name>
122144
<resource.directory>src/main/resources/gitlab</resource.directory>
123145
</properties>
146+
<dependencies>
147+
<dependency>
148+
<groupId>org.gitlab4j</groupId>
149+
<artifactId>gitlab4j-api</artifactId>
150+
<version>5.5.0</version>
151+
</dependency>
152+
</dependencies>
124153
</profile>
125154
<profile>
126155
<id>git.fb</id>
@@ -146,7 +175,7 @@
146175
</profiles>
147176

148177
<build>
149-
<finalName>${plugin.name}-${version}</finalName>
178+
<finalName>${plugin.name}-${project.version}</finalName>
150179
<resources>
151180
<resource>
152181
<directory>src/main/resources/views</directory>
@@ -176,7 +205,7 @@
176205
<configuration>
177206
<archive>
178207
<manifestEntries>
179-
<Go-Version>${go.version}</Go-Version>
208+
<Go-Version>${go.compat.version}</Go-Version>
180209
</manifestEntries>
181210
</archive>
182211
</configuration>

‎release.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
set -e -x
33

44
rm -rf dist/

‎src/main/java/in/ashwanthkumar/gocd/github/GitHubPRBuildPlugin.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
import com.tw.go.plugin.model.GitConfig;
1212
import com.tw.go.plugin.model.ModifiedFile;
1313
import com.tw.go.plugin.model.Revision;
14-
import com.tw.go.plugin.util.ListUtil;
15-
import com.tw.go.plugin.util.StringUtil;
1614
import in.ashwanthkumar.gocd.github.provider.Provider;
1715
import in.ashwanthkumar.gocd.github.settings.scm.PluginConfigurationView;
1816
import in.ashwanthkumar.gocd.github.util.BranchFilter;
@@ -22,7 +20,7 @@
2220
import in.ashwanthkumar.utils.collections.Lists;
2321
import in.ashwanthkumar.utils.func.Function;
2422
import org.apache.commons.io.IOUtils;
25-
import org.apache.commons.lang.StringUtils;
23+
import org.apache.commons.lang3.StringUtils;
2624

2725
import java.io.IOException;
2826
import java.lang.reflect.Constructor;
@@ -34,7 +32,7 @@
3432

3533
@Extension
3634
public class GitHubPRBuildPlugin implements GoPlugin {
37-
private static Logger LOGGER = Logger.getLoggerFor(GitHubPRBuildPlugin.class);
35+
private static final Logger LOGGER = Logger.getLoggerFor(GitHubPRBuildPlugin.class);
3836

3937
public static final String EXTENSION_NAME = "scm";
4038
private static final List<String> goSupportedVersions = asList("1.0");
@@ -174,7 +172,7 @@ private GoPluginApiResponse getPluginConfiguration(PluginConfigurationView view)
174172
}
175173

176174
private GoPluginApiResponse handleSCMValidation(GoPluginApiRequest goPluginApiRequest) {
177-
Map<String, Object> requestBodyMap = (Map<String, Object>) fromJSON(goPluginApiRequest.requestBody());
175+
Map<String, Object> requestBodyMap = fromJSON(goPluginApiRequest.requestBody());
178176
final Map<String, String> configuration = keyValuePairs(requestBodyMap, "scm-configuration");
179177
final GitConfig gitConfig = getGitConfig(configuration);
180178

@@ -189,7 +187,7 @@ public void validate(Map<String, Object> fieldValidation) {
189187
}
190188

191189
private GoPluginApiResponse handleSCMCheckConnection(GoPluginApiRequest goPluginApiRequest) {
192-
Map<String, Object> requestBodyMap = (Map<String, Object>) fromJSON(goPluginApiRequest.requestBody());
190+
Map<String, Object> requestBodyMap = fromJSON(goPluginApiRequest.requestBody());
193191
Map<String, String> configuration = keyValuePairs(requestBodyMap, "scm-configuration");
194192
GitConfig gitConfig = getGitConfig(configuration);
195193

@@ -207,7 +205,7 @@ private GoPluginApiResponse handleSCMCheckConnection(GoPluginApiRequest goPlugin
207205
}
208206

209207
GoPluginApiResponse handleGetLatestRevision(GoPluginApiRequest goPluginApiRequest) {
210-
Map<String, Object> requestBodyMap = (Map<String, Object>) fromJSON(goPluginApiRequest.requestBody());
208+
Map<String, Object> requestBodyMap = fromJSON(goPluginApiRequest.requestBody());
211209
Map<String, String> configuration = keyValuePairs(requestBodyMap, "scm-configuration");
212210
GitConfig gitConfig = getGitConfig(configuration);
213211
String flyweightFolder = (String) requestBodyMap.get("flyweight-folder");
@@ -249,12 +247,12 @@ private String removeUsernameAndPassword(String message, GitConfig gitConfig) {
249247
}
250248

251249
GoPluginApiResponse handleLatestRevisionSince(GoPluginApiRequest goPluginApiRequest) {
252-
Map<String, Object> requestBodyMap = (Map<String, Object>) fromJSON(goPluginApiRequest.requestBody());
250+
Map<String, Object> requestBodyMap = fromJSON(goPluginApiRequest.requestBody(), Map.class);
253251
Map<String, String> configuration = keyValuePairs(requestBodyMap, "scm-configuration");
254252
final GitConfig gitConfig = getGitConfig(configuration);
255253
Map<String, String> scmData = (Map<String, String>) requestBodyMap.get("scm-data");
256-
Map<String, String> oldBranchToRevisionMap = (Map<String, String>) fromJSON(scmData.get(BRANCH_TO_REVISION_MAP));
257-
Map<String, String> lastKnownBranchToRevisionMap = (Map<String, String>) fromJSON(scmData.get(BRANCH_TO_REVISION_MAP));
254+
Map<String, String> oldBranchToRevisionMap = fromJSON(scmData.get(BRANCH_TO_REVISION_MAP));
255+
Map<String, String> lastKnownBranchToRevisionMap = fromJSON(scmData.get(BRANCH_TO_REVISION_MAP));
258256
String flyweightFolder = (String) requestBodyMap.get("flyweight-folder");
259257
LOGGER.debug(String.format("Fetching latest for: %s", gitConfig.getUrl()));
260258

@@ -352,7 +350,7 @@ public Map<String, Object> apply(Revision revision) {
352350

353351
private Map<String, Object> getRevisionMapForSHA(GitConfig gitConfig, String branch, Revision revision) {
354352
// patch for building merge commits
355-
if (revision.isMergeCommit() && ListUtil.isEmpty(revision.getModifiedFiles())) {
353+
if (revision.isMergeCommit() && (revision.getModifiedFiles() == null || revision.getModifiedFiles().isEmpty())) {
356354
revision.setModifiedFiles(Lists.of(new ModifiedFile("/dev/null", "deleted")));
357355
}
358356

@@ -364,7 +362,7 @@ private boolean branchHasNewChange(String previousSHA, String latestSHA) {
364362
}
365363

366364
private GoPluginApiResponse handleCheckout(GoPluginApiRequest goPluginApiRequest) {
367-
Map<String, Object> requestBodyMap = (Map<String, Object>) fromJSON(goPluginApiRequest.requestBody());
365+
Map<String, Object> requestBodyMap = fromJSON(goPluginApiRequest.requestBody());
368366
Map<String, String> configuration = keyValuePairs(requestBodyMap, "scm-configuration");
369367
GitConfig gitConfig = getGitConfig(configuration);
370368
String destinationFolder = (String) requestBodyMap.get("destination-folder");
@@ -416,7 +414,7 @@ Map<String, Object> getRevisionMap(GitConfig gitConfig, String branch, Revision
416414
response.put("timestamp", new SimpleDateFormat(DATE_PATTERN).format(revision.getTimestamp()));
417415
response.put("revisionComment", revision.getComment());
418416
List<Map> modifiedFilesMapList = new ArrayList<Map>();
419-
if (!ListUtil.isEmpty(revision.getModifiedFiles())) {
417+
if (revision.getModifiedFiles() != null && !revision.getModifiedFiles().isEmpty()) {
420418
for (ModifiedFile modifiedFile : revision.getModifiedFiles()) {
421419
Map<String, String> modifiedFileMap = new HashMap<String, String>();
422420
modifiedFileMap.put("fileName", modifiedFile.getFileName());
@@ -443,7 +441,7 @@ private Map<String, String> keyValuePairs(Map<String, Object> requestBodyMap, St
443441
}
444442

445443
public void validateUrl(GitConfig gitConfig, Map<String, Object> fieldMap) {
446-
if (StringUtil.isEmpty(gitConfig.getUrl())) {
444+
if (StringUtils.isEmpty(gitConfig.getUrl())) {
447445
fieldMap.put("key", "url");
448446
fieldMap.put("message", "URL is a required field");
449447
} else if (!provider.isValidURL(gitConfig.getUrl())) {
@@ -453,7 +451,7 @@ public void validateUrl(GitConfig gitConfig, Map<String, Object> fieldMap) {
453451
}
454452

455453
public void checkConnection(GitConfig gitConfig, Map<String, Object> response, List<String> messages) {
456-
if (StringUtil.isEmpty(gitConfig.getUrl())) {
454+
if (StringUtils.isEmpty(gitConfig.getUrl())) {
457455
response.put("status", "failure");
458456
messages.add("URL is empty");
459457
} else if (!provider.isValidURL(gitConfig.getUrl())) {

‎src/main/java/in/ashwanthkumar/gocd/github/provider/github/GHUtils.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package in.ashwanthkumar.gocd.github.provider.github;
22

33
import org.apache.commons.io.IOUtils;
4-
import org.eclipse.jgit.lib.Ref;
5-
import org.kohsuke.github.GitHub;
6-
import org.kohsuke.github.GitHubBuilder;
74

85
import java.io.File;
96
import java.io.FileInputStream;

‎src/main/java/in/ashwanthkumar/gocd/github/provider/github/GitHubProvider.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package in.ashwanthkumar.gocd.github.provider.github;
22

33
import com.thoughtworks.go.plugin.api.GoPluginIdentifier;
4+
import com.thoughtworks.go.plugin.api.logging.Logger;
45
import com.tw.go.plugin.model.GitConfig;
5-
import com.tw.go.plugin.util.StringUtil;
66
import in.ashwanthkumar.gocd.github.provider.Provider;
77
import in.ashwanthkumar.gocd.github.provider.github.model.PullRequestStatus;
88
import in.ashwanthkumar.gocd.github.settings.general.DefaultGeneralPluginConfigurationView;
@@ -15,16 +15,14 @@
1515
import org.kohsuke.github.GHPullRequest;
1616
import org.kohsuke.github.GHUser;
1717
import org.kohsuke.github.GitHub;
18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
2018

2119
import java.io.IOException;
2220
import java.util.Arrays;
2321
import java.util.Map;
2422
import java.util.Properties;
2523

2624
public class GitHubProvider implements Provider {
27-
private static final Logger LOG = LoggerFactory.getLogger(GitHubProvider.class);
25+
private static final Logger LOG = Logger.getLoggerFor(GitHubProvider.class);
2826
// public static final String PR_FETCH_REFSPEC = "+refs/pull/*/merge:refs/gh-merge/remotes/origin/*";
2927
// public static final String PR_MERGE_PREFIX = "refs/gh-merge/remotes/origin/";
3028
public static final String REF_SPEC = "+refs/pull/*/head:refs/remotes/origin/pull-request/*";
@@ -45,10 +43,10 @@ public String getName() {
4543
public void addConfigData(GitConfig gitConfig) {
4644
try {
4745
Properties props = GHUtils.readPropertyFile();
48-
if (StringUtil.isEmpty(gitConfig.getUsername())) {
46+
if (StringUtils.isEmpty(gitConfig.getUsername())) {
4947
gitConfig.setUsername(props.getProperty("login"));
5048
}
51-
if (StringUtil.isEmpty(gitConfig.getPassword())) {
49+
if (StringUtils.isEmpty(gitConfig.getPassword())) {
5250
gitConfig.setPassword(props.getProperty("password"));
5351
}
5452
} catch (IOException e) {

0 commit comments

Comments
 (0)