Use cache when writing the manifest and jar

Signed-off-by: Guillaume Nodet <[email protected]>

Author: gnodet

maven-plugins/bnd-maven-plugin/pom.xml

@@ -47,6 +47,10 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+		</dependency>
 
 
 		<!-- dependencies to annotations -->

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

@@ -66,6 +66,7 @@
 import org.apache.maven.project.MavenProjectHelper;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.shared.mapping.MappingUtils;
+import org.codehaus.plexus.util.io.CachingOutputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonatype.plexus.build.incremental.BuildContext;
@@ -457,8 +458,12 @@ private void attachArtifactToProject(Jar bndJar) throws Exception {
 
 			Files.createDirectories(artifactFile.toPath()
 				.getParent());
-			try (OutputStream os = buildContext.newFileOutputStream(artifactFile)) {
+			try (CachingOutputStream os = new CachingOutputStream(artifactFile)) {
 				bndJar.write(os);
+				os.flush();
+				if (os.isModified()) {
+					buildContext.refresh(artifactFile);
+				}
 			}
 			buildContext.setValue(LAST_MODIFIED, artifactFile.lastModified());
 		}
@@ -613,8 +618,12 @@ private void writeContent(Jar jar, File directory) throws Exception {
 				}
 				Files.createDirectories(outFile.toPath()
 					.getParent());
-				try (OutputStream out = buildContext.newFileOutputStream(outFile)) {
+				try (CachingOutputStream out = new CachingOutputStream(outFile)) {
 					IO.copy(resource.openInputStream(), out);
+					out.flush();
+					if (out.isModified()) {
+						buildContext.refresh(outFile);
+					}
 				}
 			}
 		}
@@ -632,8 +641,12 @@ private void writeManifest(Jar jar, File manifestPath) throws Exception {
 			}
 			Files.createDirectories(manifestPath.toPath()
 				.getParent());
-			try (OutputStream manifestOut = buildContext.newFileOutputStream(manifestPath)) {
+			try (CachingOutputStream manifestOut = new CachingOutputStream(manifestPath)) {
 				jar.writeManifest(manifestOut);
+				manifestOut.flush();
+				if (manifestOut.isModified()) {
+					buildContext.refresh(manifestPath);
+				}
 			}
 			buildContext.setValue(LAST_MODIFIED, manifestPath.lastModified());
 		}

maven-plugins/bnd-plugin-parent/pom.xml

@@ -196,6 +196,11 @@
 				<version>${osgi.annotation.version}</version>
 				<scope>provided</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.codehaus.plexus</groupId>
+				<artifactId>plexus-utils</artifactId>
+				<version>3.6.0</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>