Removed commented-out code; moved property expansion code to separate method.

Author: bradleylarrick

japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpProcessor.java

@@ -140,16 +140,6 @@ private void setUpOverrideCompatibilityChanges(
 						break;
 					}
 				}
-				// This is dead code. foundSemanticVersionLevel is initialized above, and the for-loop
-				// never sets it to null; therefore, it is always non-null.
-				//
-				//				if (foundSemanticVersionLevel == null) {
-				//					throw new MojoFailureException("Unknown semantic version level '"
-				//						+ semanticVersionLevel
-				//						+ "'. Supported values: "
-				//						+ Joiner.on(',').join(
-				//						JApiSemanticVersionLevel.values()));
-				//				}
 				comparatorOptions.addOverrideCompatibilityChange(
 					new JarArchiveComparatorOptions.OverrideCompatibilityChange(foundChange,
 						configChange.isBinaryCompatible(),
@@ -903,22 +893,8 @@ List<JApiCmpArchive> resolveDependencyToFile(final String parameterName,
 			}
 		} else {
 			// Substitute any properties in the path with their values
-			final String systemPath = dependency.getSystemPath();
-			final StringBuffer newSystemPath = new StringBuffer();
-			final Pattern pattern = Pattern.compile("\\$\\{([^}]*)}");
-			final Matcher matcher = pattern.matcher(systemPath);
-			while (matcher.find()) {
-				final String property = matcher.group(1);
-				final String propertyResolved = mavenParameters.mavenProject().getProperties().getProperty(property);
-				if (propertyResolved != null) {
-					matcher.appendReplacement(newSystemPath, Matcher.quoteReplacement(propertyResolved));
-				} else {
-					throw new MojoFailureException("Could not resolve property '" + property + "'.");
-				}
-			}
-			matcher.appendTail(newSystemPath);
-
-			final File file = new File(newSystemPath.toString());
+			final String systemPath = expandProperties(dependency.getSystemPath());
+			final File file = new File(systemPath);
 			boolean addFile = true;
 			if (!file.exists()) {
 				if (ignoreMissingArtifact(configurationVersion)) {
@@ -946,6 +922,30 @@ List<JApiCmpArchive> resolveDependencyToFile(final String parameterName,
 		return jApiCmpArchives;
 	}
 
+	/**
+	 * Expands any properties found in the given {@code String}.
+	 *
+	 * @param source the source {@code String} to expand
+	 * @return the source  {@code String} with all properties expanded
+	 * @throws MojoFailureException if a property can't be resolved
+	 */
+	private String expandProperties(final String source) throws MojoFailureException {
+		final StringBuffer newString = new StringBuffer();
+		final Pattern pattern = Pattern.compile("\\$\\{([^}]*)}");
+		final Matcher matcher = pattern.matcher(source);
+		while (matcher.find()) {
+			final String property = matcher.group(1);
+			final String propertyResolved = mavenParameters.mavenProject().getProperties().getProperty(property);
+			if (propertyResolved != null) {
+				matcher.appendReplacement(newString, Matcher.quoteReplacement(propertyResolved));
+			} else {
+				throw new MojoFailureException("Could not resolve property '" + property + "'.");
+			}
+		}
+		matcher.appendTail(newString);
+		return newString.toString();
+	}
+
 	private boolean ignoreMissingArtifact(final ConfigurationVersion configurationVersion) {
 		return ignoreNonResolvableArtifacts()
 			|| ignoreMissingOldVersion(configurationVersion)