Skip to content
Permalink
Browse files

JENKINS-25886: Minor java 1.6-1.7 compatibility fix to make javancss …

…reporting work
  • Loading branch information...
buep committed Dec 7, 2014
1 parent 703a6ca commit aa41c562c70e174e7177dd058b401243ddbc9d52
@@ -249,10 +249,10 @@ public BuildData checkAndDetermineRelevantBuildData(List<BuildData> data) throws
throw new NothingToDoException("No Git SCM change found.");
}

Set<BuildData> relevantBuildData = new HashSet<>();
Set<BuildData> relevantBuildData = new HashSet<BuildData>();

// Using this HashSet only to detech duplicates
Set<String> revs = new HashSet<>();
Set<String> revs = new HashSet<String>();

// An example on several BuilData - visualized can be found in 'docs/More_than_1_gitBuild_data.png'
for(BuildData bdata : data) {
@@ -458,7 +458,7 @@ public void validateConfiguration(AbstractProject<?, ?> project) throws Unsuppor
* @throws UnsupportedConfigurationException
*/
private boolean validateMultiScm(List<SCM> scms) throws UnsupportedConfigurationException {
Set<String> remoteNames = new HashSet<>();
Set<String> remoteNames = new HashSet<String>();

for(SCM scm : scms) {
if(scm instanceof GitSCM) {
@@ -54,7 +54,7 @@ public void integrateMasterBranch() throws Exception {

Repository repo = TestUtilsFactory.createRepoWithoutBranches("master");

List<GitSCMExtension> gitSCMExtensions = new ArrayList<>();
List<GitSCMExtension> gitSCMExtensions = new ArrayList<GitSCMExtension>();
gitSCMExtensions.add(new PruneStaleBranch());
gitSCMExtensions.add(new CleanCheckout());

0 comments on commit aa41c56

Please sign in to comment.
You can’t perform that action at this time.