Fixed ecj warnings during build
diff --git a/build.gradle b/build.gradle
index 8cca719..042bea4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,8 +53,7 @@
jvmArgs = [
'-cp',
configurations.ecj.asPath,
- 'org.eclipse.jdt.internal.compiler.batch.Main',
- '-warn:-unused']
+ 'org.eclipse.jdt.internal.compiler.batch.Main']
}
}
}
@@ -67,8 +66,7 @@
jvmArgs = [
'-cp',
configurations.ecj.asPath,
- 'org.eclipse.jdt.internal.compiler.batch.Main',
- '-warn:-unused']
+ 'org.eclipse.jdt.internal.compiler.batch.Main']
}
}
}
diff --git a/org.eclipse.virgo.bundlor.ant/src/main/java/org/eclipse/virgo/bundlor/ant/internal/support/PropertyPropertiesSource.java b/org.eclipse.virgo.bundlor.ant/src/main/java/org/eclipse/virgo/bundlor/ant/internal/support/PropertyPropertiesSource.java
index 472ecc9..98f5d20 100644
--- a/org.eclipse.virgo.bundlor.ant/src/main/java/org/eclipse/virgo/bundlor/ant/internal/support/PropertyPropertiesSource.java
+++ b/org.eclipse.virgo.bundlor.ant/src/main/java/org/eclipse/virgo/bundlor/ant/internal/support/PropertyPropertiesSource.java
@@ -15,9 +15,6 @@
import java.util.Properties;
import org.apache.tools.ant.taskdefs.Property;
-import org.apache.tools.ant.types.PropertySet;
-
-import org.eclipse.virgo.bundlor.support.properties.PropertiesPropertiesSource;
import org.eclipse.virgo.bundlor.support.properties.PropertiesSource;
public class PropertyPropertiesSource implements PropertiesSource {
diff --git a/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/PartialManifestResolver.java b/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/PartialManifestResolver.java
index ff8f365..235d20f 100644
--- a/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/PartialManifestResolver.java
+++ b/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/PartialManifestResolver.java
@@ -12,7 +12,6 @@
package org.eclipse.virgo.bundlor.support;
import org.eclipse.virgo.bundlor.support.partialmanifest.ReadablePartialManifest;
-import org.eclipse.virgo.bundlor.support.partialmanifest.StandardReadablePartialManifest;
import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
import org.eclipse.virgo.util.parser.manifest.ManifestContents;
diff --git a/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/manifestwriter/JarFileManifestWriter.java b/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/manifestwriter/JarFileManifestWriter.java
index f447282..cf87d89 100644
--- a/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/manifestwriter/JarFileManifestWriter.java
+++ b/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/manifestwriter/JarFileManifestWriter.java
@@ -24,10 +24,9 @@
import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
-import org.eclipse.virgo.bundlor.util.FileCopyUtils;
-
import org.eclipse.virgo.bundlor.ManifestWriter;
import org.eclipse.virgo.bundlor.util.BundleManifestUtils;
+import org.eclipse.virgo.bundlor.util.FileCopyUtils;
import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
import org.eclipse.virgo.util.parser.manifest.ManifestContents;
@@ -45,8 +44,8 @@
public void write(ManifestContents manifest) {
JarOutputStream out = null;
InputStream in = null;
+ JarFile inputJar = null;
try {
- JarFile inputJar;
if (inputFile.equals(outputFile)) {
File tempFile = File.createTempFile("org.eclipse.virgo.bundlor", ".tmp");
FileCopyUtils.copy(new FileInputStream(inputFile), new FileOutputStream(tempFile));
@@ -77,18 +76,21 @@
}
}
}
-
+
System.out.printf("Transformed bundle written to '%s'%n", outputFile.getAbsolutePath());
} catch (IOException e) {
throw new RuntimeException(e);
- } finally {
- try {
+ } finally {
+ try {
if (out != null) {
out.flush();
out.closeEntry();
out.flush();
out.close();
}
+ if(inputJar != null) {
+ inputJar.close();
+ }
} catch (IOException e) {
// Nothing to do
}
diff --git a/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/partialmanifest/PartialManifest.java b/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/partialmanifest/PartialManifest.java
index 3e82c3b..71a1d12 100644
--- a/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/partialmanifest/PartialManifest.java
+++ b/org.eclipse.virgo.bundlor/src/main/java/org/eclipse/virgo/bundlor/support/partialmanifest/PartialManifest.java
@@ -11,8 +11,6 @@
package org.eclipse.virgo.bundlor.support.partialmanifest;
-import org.eclipse.virgo.bundlor.support.ArtifactAnalyzer;
-
/**
* Describes a partially-constructed, dynamically-generated manifest. {@link ArtifactAnalyzer ArtefactAnalysers}
* contribute manifest elements (imports and exports) to a <code>PartialManifest</code> during analysis.
