diff --git a/build.properties b/build.properties
index 425216111..bfbde63d4 100644
--- a/build.properties
+++ b/build.properties
@@ -9,8 +9,8 @@
 
 # Javadocs
 # Note: Include the trailing slash! Don't surround the URL in quotes!
-javasedocs.url=http://docs.oracle.com/javase/6/docs/api/
-javaeedocs.url=http://docs.oracle.com/javaee/6/api/
+javasedocs.url=http://docs.oracle.com/javase/7/docs/api/
+javaeedocs.url=http://docs.oracle.com/javaee/7/api/
 # The following link is dead, perhaps temporarily,
 # perhaps not, as they move 7 and 8 to unsupported status.
 #jettydocs.url=http://download.eclipse.org/jetty/stable-8/apidocs/
diff --git a/installer/resources/package-lists/java/package-list b/installer/resources/package-lists/java/package-list
index 3e918cda5..b52fe94b6 100644
--- a/installer/resources/package-lists/java/package-list
+++ b/installer/resources/package-lists/java/package-list
@@ -17,6 +17,7 @@ java.io
 java.lang
 java.lang.annotation
 java.lang.instrument
+java.lang.invoke
 java.lang.management
 java.lang.ref
 java.lang.reflect
@@ -27,6 +28,9 @@ java.nio.channels
 java.nio.channels.spi
 java.nio.charset
 java.nio.charset.spi
+java.nio.file
+java.nio.file.attribute
+java.nio.file.spi
 java.rmi
 java.rmi.activation
 java.rmi.dgc
@@ -120,6 +124,7 @@ javax.swing.plaf
 javax.swing.plaf.basic
 javax.swing.plaf.metal
 javax.swing.plaf.multi
+javax.swing.plaf.nimbus
 javax.swing.plaf.synth
 javax.swing.table
 javax.swing.text
@@ -163,6 +168,7 @@ javax.xml.ws.handler.soap
 javax.xml.ws.http
 javax.xml.ws.soap
 javax.xml.ws.spi
+javax.xml.ws.spi.http
 javax.xml.ws.wsaddressing
 javax.xml.xpath
 org.ietf.jgss
diff --git a/installer/resources/package-lists/javaee/package-list b/installer/resources/package-lists/javaee/package-list
index 9f89c7a75..f87ec74d7 100644
--- a/installer/resources/package-lists/javaee/package-list
+++ b/installer/resources/package-lists/javaee/package-list
@@ -1,11 +1,20 @@
 javax.annotation
 javax.annotation.security
 javax.annotation.sql
+javax.batch.api
+javax.batch.api.chunk
+javax.batch.api.chunk.listener
+javax.batch.api.listener
+javax.batch.api.partition
+javax.batch.operations
+javax.batch.runtime
+javax.batch.runtime.context
 javax.decorator
 javax.ejb
 javax.ejb.embeddable
 javax.ejb.spi
 javax.el
+javax.enterprise.concurrent
 javax.enterprise.context
 javax.enterprise.context.spi
 javax.enterprise.deploy.model
@@ -31,6 +40,8 @@ javax.faces.context
 javax.faces.convert
 javax.faces.el
 javax.faces.event
+javax.faces.flow
+javax.faces.flow.builder
 javax.faces.lifecycle
 javax.faces.model
 javax.faces.render
@@ -41,6 +52,9 @@ javax.faces.webapp
 javax.inject
 javax.interceptor
 javax.jms
+javax.json
+javax.json.spi
+javax.json.stream
 javax.jws
 javax.jws.soap
 javax.mail
@@ -81,10 +95,16 @@ javax.transaction.xa
 javax.validation
 javax.validation.bootstrap
 javax.validation.constraints
+javax.validation.constraintvalidation
+javax.validation.executable
 javax.validation.groups
 javax.validation.metadata
 javax.validation.spi
+javax.websocket
+javax.websocket.server
 javax.ws.rs
+javax.ws.rs.client
+javax.ws.rs.container
 javax.ws.rs.core
 javax.ws.rs.ext
 javax.xml.bind
@@ -102,6 +122,7 @@ javax.xml.rpc.handler.soap
 javax.xml.rpc.holders
 javax.xml.rpc.server
 javax.xml.rpc.soap
+javax.xml.soap
 javax.xml.ws
 javax.xml.ws.handler
 javax.xml.ws.handler.soap
diff --git a/installer/resources/package-lists/jetty/package-list b/installer/resources/package-lists/jetty/package-list
index 63752420b..cb418a087 100644
--- a/installer/resources/package-lists/jetty/package-list
+++ b/installer/resources/package-lists/jetty/package-list
@@ -13,6 +13,7 @@ org.eclipse.jetty.deploy.jmx
 org.eclipse.jetty.deploy.providers
 org.eclipse.jetty.deploy.util
 org.eclipse.jetty.embedded
+org.eclipse.jetty.example.asyncrest
 org.eclipse.jetty.http
 org.eclipse.jetty.http.gzip
 org.eclipse.jetty.http.spi
@@ -34,20 +35,17 @@ org.eclipse.jetty.nested
 org.eclipse.jetty.nosql
 org.eclipse.jetty.nosql.mongodb
 org.eclipse.jetty.nosql.mongodb.jmx
+org.eclipse.jetty.osgi.annotations
 org.eclipse.jetty.osgi.boot
 org.eclipse.jetty.osgi.boot.internal.jsp
 org.eclipse.jetty.osgi.boot.internal.serverfactory
 org.eclipse.jetty.osgi.boot.internal.webapp
 org.eclipse.jetty.osgi.boot.jasper
 org.eclipse.jetty.osgi.boot.jsp
-org.eclipse.jetty.osgi.boot.logback
-org.eclipse.jetty.osgi.boot.logback.internal
 org.eclipse.jetty.osgi.boot.utils
 org.eclipse.jetty.osgi.boot.utils.internal
 org.eclipse.jetty.osgi.boot.warurl
 org.eclipse.jetty.osgi.boot.warurl.internal
-org.eclipse.jetty.osgi.equinoxtools
-org.eclipse.jetty.osgi.equinoxtools.console
 org.eclipse.jetty.osgi.httpservice
 org.eclipse.jetty.osgi.nested
 org.eclipse.jetty.overlays
@@ -78,7 +76,6 @@ org.eclipse.jetty.server.session
 org.eclipse.jetty.server.session.jmx
 org.eclipse.jetty.server.ssl
 org.eclipse.jetty.servlet
-org.eclipse.jetty.servlet.api
 org.eclipse.jetty.servlet.jmx
 org.eclipse.jetty.servlet.listener
 org.eclipse.jetty.servlets