diff --git a/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/maven/BndMavenLifecycleParticipant.java b/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/maven/BndMavenLifecycleParticipant.java
index f6bdd82706..7bb401fe07 100644
--- a/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/maven/BndMavenLifecycleParticipant.java
+++ b/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/maven/BndMavenLifecycleParticipant.java
@@ -71,7 +71,7 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
 		Map<MavenProject, Project> bndProjects = getProjects(session);
 		Map<String, MavenProject> manifestFirstProjects = getManifestFirstProjects(session, bndProjects.keySet());
 		Map<String, MavenProject> bndWorkspaceProjects = bndProjects.entrySet().stream()
-				.collect(Collectors.toMap(e -> e.getValue().getName(), e -> e.getKey(), (a, b) -> {
+				.collect(Collectors.toMap(e -> e.getValue().getName(), Entry<MavenProject, Project>::getKey, (a, b) -> {
 					logger.warn(
 							"Your reactor build contains duplicate BND projects from different workspace, build order might be insufficient!");
 					logger.warn("\tProject 1 (selected): " + a.getBasedir());
@@ -166,8 +166,8 @@ private Map<String, MavenProject> getManifestFirstProjects(MavenSession session,
 	}
 
 	private Map<MavenProject, Project> getProjects(MavenSession session) {
-		Set<Workspace> workspaces = new HashSet<Workspace>();
-		HashMap<MavenProject, Project> result = new HashMap<MavenProject, Project>();
+		Set<Workspace> workspaces = new HashSet<>();
+		HashMap<MavenProject, Project> result = new HashMap<>();
 		for (MavenProject mavenProject : session.getProjects()) {
 			if (isBNDProject(mavenProject)) {
 				try {