Merge pull request #200 from bmarwell/194-cleanup-generic

[#194] clean generics (guava removal)

Author: sparsick

src/main/java/org/reficio/p2/FeatureBuilder.java

@@ -38,7 +38,7 @@ public class FeatureBuilder {
 
 
 	public FeatureBuilder(P2FeatureDefinition p2FeatureDefintion,
-						  final P2ArtifactMap bundlerInstructions,
+						  final P2ArtifactMap<ArtifactBundlerInstructions> bundlerInstructions,
 						  boolean generateSourceFeature,
 						  boolean unpack,
 						  String timestamp) {

src/main/java/org/reficio/p2/P2Mojo.java

@@ -367,7 +367,7 @@ private void processFeatures() {
 
 
     private P2ArtifactMap<ResolvedArtifact> resolveArtifacts(List<P2Artifact> artifacts) {
-        P2ArtifactMap<ResolvedArtifact> resolvedArtifacts = new P2ArtifactMap<ResolvedArtifact>();
+        P2ArtifactMap<ResolvedArtifact> resolvedArtifacts = new P2ArtifactMap<>();
         for (P2Artifact p2Artifact : artifacts) {
             logResolving(p2Artifact);
             ArtifactResolutionResult resolutionResult;