GBLD-2003: update manifest if there are changes in outputDirectory

If new (generated) classes are compiled between full build and
incremental build, bnd-maven-plugin didn't recognize the changes. We
compare now manifest last modified timestamp with newly calculated last
modified timestamp based on output directory and dependencies.

(re-made from 6142206)

Author: cpfeiffer

maven-plugins/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java

@@ -349,7 +349,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 			logger.debug("builder classpath: {}", builder.getProperty("project.buildpath"));
 
 			// Compute bnd sourcepath
-			boolean delta = !buildContext.isIncremental() || outOfDate();
+			boolean delta = !buildContext.isIncremental() || outOfDate(builder.lastModified());
 			List<File> sourcepath = new ArrayList<>();
 			if (getSourceDir().exists()) {
 				sourcepath.add(getSourceDir().getCanonicalFile());
@@ -446,7 +446,7 @@ protected void processBuildPath(List<Object> buildpath) {}
 
 	private void attachArtifactToProject(Jar bndJar) throws Exception {
 		File artifactFile = getArtifactFile();
-		if (outOfDate(artifactFile) || artifactFile.lastModified() < bndJar.lastModified()) {
+		if (outOfDate(artifactFile, bndJar.lastModified())) {
 			if (logger.isDebugEnabled()) {
 				if (artifactFile.exists())
 					logger.debug(String.format("Updating lastModified: %tF %<tT.%<tL '%s'", artifactFile.lastModified(),
@@ -622,9 +622,9 @@ private void writeContent(Jar jar, File directory) throws Exception {
 
 	private void writeManifest(Jar jar, File manifestPath) throws Exception {
 		final long lastModified = jar.lastModified();
-		if (outOfDate(manifestPath) || manifestPath.lastModified() < lastModified) {
+		if (outOfDate(manifestPath, lastModified)) {
 			if (logger.isDebugEnabled()) {
-				if (!outOfDate(manifestPath))
+				if (manifestPath.isFile())
 					logger.debug(String.format("Updating lastModified: %tF %<tT.%<tL '%s'",
 						manifestPath.lastModified(), manifestPath));
 				else
@@ -639,13 +639,13 @@ private void writeManifest(Jar jar, File manifestPath) throws Exception {
 		}
 	}
 
-	private boolean outOfDate() {
+	private boolean outOfDate(long lm) {
 		String goal = mojoExecution.getMojoDescriptor()
 			.getGoal();
-		return outOfDate(isPackagingGoal(goal) ? getArtifactFile() : getManifestPath());
+		return outOfDate(isPackagingGoal(goal) ? getArtifactFile() : getManifestPath(), lm);
 	}
 
-	private boolean outOfDate(File target) {
+	private boolean outOfDate(File target, long lm) {
 		if (!target.isFile()) {
 			return true;
 		}
@@ -654,6 +654,7 @@ private boolean outOfDate(File target) {
 		if (buildContext.getValue(LAST_MODIFIED) != null) {
 			lastModified = (Long) buildContext.getValue(LAST_MODIFIED);
 		}
-		return target.lastModified() != lastModified;
+		return target.lastModified() != lastModified
+			|| target.lastModified() < lm;
 	}
 }