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

Jump to bottom

Update parent pom #555

Merged
merged 2 commits into from
Nov 25, 2017
Merged

Update parent pom #555

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
a924bb3
Use parent pom 3.0 - latest update
MarkEWaite Nov 24, 2017
d492694
Test isEmpty() instead of size() == 0
MarkEWaite Nov 21, 2017
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.36</version>
<version>3.0</version>
<relativePath />
</parent>

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/plugins/git/SubmoduleCombinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ protected boolean matches(Map<IndexEntry, Revision> item, List<IndexEntry> entri

public List<Map<IndexEntry, Revision>> createCombinations(Map<IndexEntry, Collection<Revision>> moduleBranches) {

if (moduleBranches.keySet().size() == 0) return new ArrayList<>();
if (moduleBranches.keySet().isEmpty()) return new ArrayList<>();

// Get an entry:
List<Map<IndexEntry, Revision>> thisLevel = new ArrayList<>();
Expand All @@ -204,7 +204,7 @@ public List<Map<IndexEntry, Revision>> createCombinations(Map<IndexEntry, Collec
}

List<Map<IndexEntry, Revision>> children = createCombinations(moduleBranches);
if (children.size() == 0) return thisLevel;
if (children.isEmpty()) return thisLevel;

// Merge the two together
List<Map<IndexEntry, Revision>> result = new ArrayList<>();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/git/util/DefaultBuildChooser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ private List<Revision> getAdvancedCandidateRevisions(boolean isPollCall, TaskLis
}
}

if (r.getBranches().size() == 0) {
if (r.getBranches().isEmpty()) {
verbose(listener, "Ignoring {0} because we don''t care about any of the branches that point to it", r);
i.remove();
}
Expand Down