Bug 507609 - Cleanup o.e.releng.tests
Bump BREE to Java-1.8, fix warnings, bump version.
Change-Id: Id658fc4ab95a1678c0b21d3960229f4c0e04e911
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.releng.tests/.classpath b/bundles/org.eclipse.releng.tests/.classpath
index e8ea977..eca7bdb 100644
--- a/bundles/org.eclipse.releng.tests/.classpath
+++ b/bundles/org.eclipse.releng.tests/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.releng.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.releng.tests/.settings/org.eclipse.jdt.core.prefs
index 94c397d..4d5cbdb 100644
--- a/bundles/org.eclipse.releng.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.releng.tests/.settings/org.eclipse.jdt.core.prefs
@@ -18,9 +18,9 @@
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,6 +112,6 @@
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF
index e1c909b..5b0be4e 100644
--- a/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.releng.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.releng.tests;singleton:=true
-Bundle-Version: 3.3.100.qualifier
+Bundle-Version: 3.4.0.qualifier
Eclipse-BundleShape: dir
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
@@ -13,5 +13,5 @@
org.eclipse.egit.core;bundle-version="3.0.0";resolution:=optional,
org.eclipse.releng.tools;bundle-version="3.6.100"
Export-Package: org.eclipse.releng.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .
diff --git a/bundles/org.eclipse.releng.tests/pom.xml b/bundles/org.eclipse.releng.tests/pom.xml
index 9e0d901..332b0d2 100644
--- a/bundles/org.eclipse.releng.tests/pom.xml
+++ b/bundles/org.eclipse.releng.tests/pom.xml
@@ -20,7 +20,7 @@
</parent>
<groupId>org.eclipse.releng</groupId>
<artifactId>org.eclipse.releng.tests</artifactId>
- <version>3.3.100-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
diff --git a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/FileTool.java b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/FileTool.java
index 312d576..ef91450 100644
--- a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/FileTool.java
+++ b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/FileTool.java
@@ -385,49 +385,47 @@
* @param filter filters out unwanted zip entries
* @param dstDir the destination directory
*/
- public static void unzip(IZipFilter filter, File dstDir) throws IOException {
+ public static void unzip(IZipFilter filter, File dstDir) {
unzip(filter, dstDir, dstDir, 0);
}
- private static void unzip(IZipFilter filter, File rootDstDir, File dstDir, int depth) throws IOException {
+ private static void unzip(IZipFilter filter, File rootDstDir, File dstDir, int depth) {
- File [] entries = rootDstDir.listFiles();
-
- try {
- for(int i=0;i<entries.length;i++){
- if(entries[i].isDirectory()){
- unzip (filter,entries[i],dstDir,depth);
- }
- File entry = entries[i];
+ File[] entries = rootDstDir.listFiles();
- String entryName = entry.getName();
- File file = new File(dstDir, FileTool.changeSeparator(entryName, '/', File.separatorChar));
- if (entryName.endsWith(".zip") || entryName.endsWith(".jar")) {
- String fileName = file.getName();
- String dirName = fileName.substring(0, fileName.length() - 4) + "_" + fileName.substring(fileName.length() - 3);
- ZipFile innerZipFile = null;
- try {
- innerZipFile = new ZipFile(entry);
- File innerDstDir = new File(entry.getParentFile(), dirName);
- unzip(filter, innerZipFile, rootDstDir, innerDstDir, depth + 1);
- //entry.delete();
- } catch (IOException e) {
- if(innerZipFile != null){
- try {
- innerZipFile.close();
- System.out.println("Could not unzip: " + fileName + ". InnerZip = " + innerZipFile.getName() + ". Lenght: " + innerZipFile.getName().length());
- } catch(IOException e2){
- }
- } else
- System.out.println("Could not unzip: " + fileName + ". InnerZip = <null>");
- e.printStackTrace();
- }
-
- }
+ for (int i = 0; i < entries.length; i++) {
+ if (entries[i].isDirectory()) {
+ unzip(filter, entries[i], dstDir, depth);
}
- } catch(IOException e){
- e.printStackTrace();
- }
+ File entry = entries[i];
+
+ String entryName = entry.getName();
+ File file = new File(dstDir, FileTool.changeSeparator(entryName, '/', File.separatorChar));
+ if (entryName.endsWith(".zip") || entryName.endsWith(".jar")) {
+ String fileName = file.getName();
+ String dirName = fileName.substring(0, fileName.length() - 4) + "_"
+ + fileName.substring(fileName.length() - 3);
+ ZipFile innerZipFile = null;
+ try {
+ innerZipFile = new ZipFile(entry);
+ File innerDstDir = new File(entry.getParentFile(), dirName);
+ unzip(filter, innerZipFile, rootDstDir, innerDstDir, depth + 1);
+ // entry.delete();
+ } catch (IOException e) {
+ if (innerZipFile != null) {
+ try {
+ innerZipFile.close();
+ System.out.println("Could not unzip: " + fileName + ". InnerZip = " + innerZipFile.getName()
+ + ". Lenght: " + innerZipFile.getName().length());
+ } catch (IOException e2) {
+ }
+ } else
+ System.out.println("Could not unzip: " + fileName + ". InnerZip = <null>");
+ e.printStackTrace();
+ }
+
+ }
+ }
}
/**
* Zips the given directory to the given zip file.
diff --git a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/GitCopyrightAdapterTest.java b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/GitCopyrightAdapterTest.java
index f7f8b42..c135009 100644
--- a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/GitCopyrightAdapterTest.java
+++ b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/GitCopyrightAdapterTest.java
@@ -81,15 +81,13 @@
@Test
public void testLastModifiedYear() throws Exception {
- final Git git = new Git(db);
- try {
+
+ try (final Git git = new Git(db)) {
git.add().addFilepattern(PROJECT_NAME + "/" + FILE1_NAME).call();
final PersonIdent committer2011 = new PersonIdent(committer, getDateForYear(2011));
git.commit().setMessage("old commit").setCommitter(committer2011).call();
git.add().addFilepattern(PROJECT_NAME + "/" + FILE2_NAME).call();
git.commit().setMessage("new commit").call();
- } finally {
- git.close();
}
final GitCopyrightAdapter adapter = new GitCopyrightAdapter(
@@ -103,13 +101,10 @@
@Test
public void testCopyrightUpdateComment() throws Exception {
- final Git git = new Git(db);
- try {
+
+ try (final Git git = new Git(db)) {
git.add().addFilepattern(PROJECT_NAME + "/" + FILE1_NAME).call();
git.commit().setMessage("copyright update").call();
-
- } finally {
- git.close();
}
final GitCopyrightAdapter adapter = new GitCopyrightAdapter(
new IResource[] { project });
