diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index ff59d59111b21705202e6e629d45025eb233d0c5..105c30a2c49d1642e2ba395b729fee69482cbf7c 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -1,6 +1,6 @@
file.reference.sqlite-jdbc-3.7.8-SNAPSHOT.jar=release/modules/ext/sqlite-jdbc-3.7.8-SNAPSHOT.jar
file.reference.Tsk_DataModel.jar=release/modules/ext/Tsk_DataModel.jar
-javac.source=1.6
+javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 7f79dd9a3191a848015efd45cbc16839f87f53b9..a7956b7e24a9d2c1f88ebf2eae6e648366092240 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -19,6 +19,6 @@ file.reference.slf4j-api-1.6.1.jar=release/modules/ext/slf4j-api-1.6.1.jar
file.reference.slf4j-simple-1.6.1.jar=release/modules/ext/slf4j-simple-1.6.1.jar
file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar
file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar
-javac.source=1.6
+javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
nbm.needs.restart=true
diff --git a/ExifParser/nbproject/project.properties b/ExifParser/nbproject/project.properties
index 5e95dbce94edc1cc8569aaa17a42f1905f7ffe39..6f48597d02f455f7b143ed1552b9a5e9b4236097 100644
--- a/ExifParser/nbproject/project.properties
+++ b/ExifParser/nbproject/project.properties
@@ -1,4 +1,4 @@
-javac.source=1.6
+javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
diff --git a/HashDatabase/nbproject/project.properties b/HashDatabase/nbproject/project.properties
index 9dcdea211c733d1e08d006c81b1ca180ba0452e0..f278b6de1bb1df9559e6068312fe98ae36548d2a 100644
--- a/HashDatabase/nbproject/project.properties
+++ b/HashDatabase/nbproject/project.properties
@@ -1,4 +1,4 @@
-javac.source=1.6
+javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index c2673613cd4bd8461dcf8cb890a9e443de59c946..d36f563fa5c5af514e46f6429d40dad5249c0af4 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -1,4 +1,4 @@
-javac.source=1.6
+javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
diff --git a/RecentActivity/nbproject/project.properties b/RecentActivity/nbproject/project.properties
index eae0cc9761693ecba11f6ab0985079efe79931a7..dc281ec30963acf6e60e9f102a8b61a0e4ae340a 100644
--- a/RecentActivity/nbproject/project.properties
+++ b/RecentActivity/nbproject/project.properties
@@ -1,5 +1,5 @@
file.reference.gson-2.1.jar=release/modules/ext/gson-2.1.jar
-javac.source=1.6
+javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
diff --git a/Testing/nbproject/project.properties b/Testing/nbproject/project.properties
index 9dcdea211c733d1e08d006c81b1ca180ba0452e0..f278b6de1bb1df9559e6068312fe98ae36548d2a 100644
--- a/Testing/nbproject/project.properties
+++ b/Testing/nbproject/project.properties
@@ -1,4 +1,4 @@
-javac.source=1.6
+javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
diff --git a/Timeline/nbproject/project.properties b/Timeline/nbproject/project.properties
index 17255bac6ba383a61ad07388503258b87ee1f466..6baf44e2f5505a7325461115f5a019ac2e3ecd7c 100644
--- a/Timeline/nbproject/project.properties
+++ b/Timeline/nbproject/project.properties
@@ -1,2 +1,2 @@
-javac.source=1.6
+javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/Timeline/nbproject/project.xml b/Timeline/nbproject/project.xml
index fbeb1bd29348089e947debafa3b0b5237af7318e..2fa36f1ad45563d3db4fb19ecbdfc4d0c9ac8f31 100644
--- a/Timeline/nbproject/project.xml
+++ b/Timeline/nbproject/project.xml
@@ -84,7 +84,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <release-version>5</release-version>
+ <release-version>6</release-version>
<specification-version>3.0</specification-version>
</run-dependency>
</dependency>
diff --git a/Timeline/release/modules/ext/jfxrt.jar b/Timeline/release/modules/ext/jfxrt.jar
index 48109d611026cb2e94eed7919cdafbb541e884aa..232dc473f8d17a1d034b124bb494df847f13ea32 100644
Binary files a/Timeline/release/modules/ext/jfxrt.jar and b/Timeline/release/modules/ext/jfxrt.jar differ
diff --git a/build.xml b/build.xml
index 7de4e96a1bb10454fb71511608c7d8fcc10e6f21..97810b67d64dea1d6817db17a5453bce883976dc 100644
--- a/build.xml
+++ b/build.xml
@@ -84,7 +84,7 @@
<copy file="${basedir}/KNOWN_ISSUES.txt" tofile="${zip-tmp}/${app.name}/KNOWN_ISSUES.txt"/>
<unzip src="${thirdparty.dir}/gstreamer/${os.family}/i386/0.10.7/gstreamer.zip" dest="${zip-tmp}/${app.name}/gstreamer"/>
- <copy todir="${zip-tmp}/${app.name}/jre6">
+ <copy todir="${zip-tmp}/${app.name}/jre">
<fileset dir="${env.JRE_HOME}"/>
</copy>
<copy file="${basedir}/branding_${app.name}/icon.ico" tofile="${zip-tmp}/${app.name}/icon.ico" overwrite="true"/>
@@ -94,7 +94,7 @@
file="${zip-tmp}/${app.name}/etc/${app.name}.conf">
<!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
<entry key="default_options" value=""--branding ${app.name} -J-Xms24m -J-Xmx768m -J-XX:MaxPermSize=256M -J-Xverify:none"" />
- <entry key="jdkhome" value=""jre6"" />
+ <entry key="jdkhome" value=""jre"" />
</propertyfile>
<!-- step (4) zip again, but with the version numbers in the dir -->
diff --git a/nbproject/platform.properties b/nbproject/platform.properties
index db8ec56be50c50269b72b45521b5f526a8fc1c12..9073ce8bb01d5fea1ae48acfc0df458eb6d7e90b 100644
--- a/nbproject/platform.properties
+++ b/nbproject/platform.properties
@@ -1,4 +1,5 @@
branding.token=autopsy
+nbjdk.active=default
netbeans-plat-version=7.2.1
suite.dir=${basedir}
nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
@@ -9,112 +10,5 @@ cluster.path=\
${nbplatform.active.dir}/harness:\
${nbplatform.active.dir}/java:\
${nbplatform.active.dir}/platform
-disabled.modules=\
- org.apache.tools.ant.module,\
- org.netbeans.api.debugger.jpda,\
- org.netbeans.api.java,\
- org.netbeans.lib.nbjavac,\
- org.netbeans.libs.cglib,\
- org.netbeans.libs.javacapi,\
- org.netbeans.libs.javacimpl,\
- org.netbeans.libs.springframework,\
- org.netbeans.modules.ant.browsetask,\
- org.netbeans.modules.ant.debugger,\
- org.netbeans.modules.ant.freeform,\
- org.netbeans.modules.ant.grammar,\
- org.netbeans.modules.ant.kit,\
- org.netbeans.modules.beans,\
- org.netbeans.modules.classfile,\
- org.netbeans.modules.dbschema,\
- org.netbeans.modules.debugger.jpda,\
- org.netbeans.modules.debugger.jpda.ant,\
- org.netbeans.modules.debugger.jpda.kit,\
- org.netbeans.modules.debugger.jpda.projects,\
- org.netbeans.modules.debugger.jpda.ui,\
- org.netbeans.modules.debugger.jpda.visual,\
- org.netbeans.modules.findbugs.installer,\
- org.netbeans.modules.form,\
- org.netbeans.modules.form.binding,\
- org.netbeans.modules.form.j2ee,\
- org.netbeans.modules.form.kit,\
- org.netbeans.modules.form.nb,\
- org.netbeans.modules.form.refactoring,\
- org.netbeans.modules.hibernate,\
- org.netbeans.modules.hibernatelib,\
- org.netbeans.modules.hudson.ant,\
- org.netbeans.modules.hudson.maven,\
- org.netbeans.modules.i18n,\
- org.netbeans.modules.i18n.form,\
- org.netbeans.modules.j2ee.core.utilities,\
- org.netbeans.modules.j2ee.eclipselink,\
- org.netbeans.modules.j2ee.eclipselinkmodelgen,\
- org.netbeans.modules.j2ee.jpa.refactoring,\
- org.netbeans.modules.j2ee.jpa.verification,\
- org.netbeans.modules.j2ee.metadata,\
- org.netbeans.modules.j2ee.metadata.model.support,\
- org.netbeans.modules.j2ee.persistence,\
- org.netbeans.modules.j2ee.persistence.kit,\
- org.netbeans.modules.j2ee.persistenceapi,\
- org.netbeans.modules.java.api.common,\
- org.netbeans.modules.java.debug,\
- org.netbeans.modules.java.editor,\
- org.netbeans.modules.java.editor.lib,\
- org.netbeans.modules.java.examples,\
- org.netbeans.modules.java.freeform,\
- org.netbeans.modules.java.guards,\
- org.netbeans.modules.java.helpset,\
- org.netbeans.modules.java.hints,\
- org.netbeans.modules.java.hints.declarative,\
- org.netbeans.modules.java.hints.declarative.test,\
- org.netbeans.modules.java.hints.legacy.spi,\
- org.netbeans.modules.java.hints.test,\
- org.netbeans.modules.java.hints.ui,\
- org.netbeans.modules.java.j2seplatform,\
- org.netbeans.modules.java.j2seproject,\
- org.netbeans.modules.java.kit,\
- org.netbeans.modules.java.lexer,\
- org.netbeans.modules.java.navigation,\
- org.netbeans.modules.java.platform,\
- org.netbeans.modules.java.preprocessorbridge,\
- org.netbeans.modules.java.project,\
- org.netbeans.modules.java.source,\
- org.netbeans.modules.java.source.ant,\
- org.netbeans.modules.java.source.queries,\
- org.netbeans.modules.java.source.queriesimpl,\
- org.netbeans.modules.java.sourceui,\
- org.netbeans.modules.java.testrunner,\
- org.netbeans.modules.javadoc,\
- org.netbeans.modules.javawebstart,\
- org.netbeans.modules.junit,\
- org.netbeans.modules.maven,\
- org.netbeans.modules.maven.checkstyle,\
- org.netbeans.modules.maven.coverage,\
- org.netbeans.modules.maven.embedder,\
- org.netbeans.modules.maven.grammar,\
- org.netbeans.modules.maven.graph,\
- org.netbeans.modules.maven.hints,\
- org.netbeans.modules.maven.indexer,\
- org.netbeans.modules.maven.junit,\
- org.netbeans.modules.maven.kit,\
- org.netbeans.modules.maven.model,\
- org.netbeans.modules.maven.osgi,\
- org.netbeans.modules.maven.persistence,\
- org.netbeans.modules.maven.refactoring,\
- org.netbeans.modules.maven.repository,\
- org.netbeans.modules.maven.search,\
- org.netbeans.modules.maven.spring,\
- org.netbeans.modules.projectimport.eclipse.core,\
- org.netbeans.modules.projectimport.eclipse.j2se,\
- org.netbeans.modules.refactoring.java,\
- org.netbeans.modules.spellchecker.bindings.java,\
- org.netbeans.modules.spring.beans,\
- org.netbeans.modules.testng,\
- org.netbeans.modules.testng.ant,\
- org.netbeans.modules.testng.maven,\
- org.netbeans.modules.websvc.jaxws21,\
- org.netbeans.modules.websvc.jaxws21api,\
- org.netbeans.modules.websvc.saas.codegen.java,\
- org.netbeans.modules.xml.jaxb,\
- org.netbeans.modules.xml.tools.java,\
- org.netbeans.spi.java.hints
+disabled.modules=
diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties
index 948f77044aaee4cee5a8a339df051255fe48951b..b61cdddfa70eaa4c91e2f54007848f05823c24c3 100644
--- a/thunderbirdparser/nbproject/project.properties
+++ b/thunderbirdparser/nbproject/project.properties
@@ -1,5 +1,5 @@
file.reference.commons-lang-2.4.jar=release/modules/ext/commons-lang-2.4.jar
-javac.source=1.6
+javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/