diff --git a/pom.xml b/pom.xml
index e6b398c..65abdca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,13 +31,13 @@
   <url>https://commons.apache.org/proper/commons-beanutils/</url>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <commons.componentid>beanutils</commons.componentid>
     <commons.module.name>org.apache.commons.beanutils2</commons.module.name>
     <!-- Current version -->
     <commons.release.version>2.0.0</commons.release.version>
-    <commons.release.desc>(Java 7)</commons.release.desc>
+    <commons.release.desc>(Java 8)</commons.release.desc>
     <!-- Previous major version -->
     <commons.release.2.version>1.9.3</commons.release.2.version>
     <commons.release.2.desc>(Java 6)</commons.release.2.desc>
@@ -48,10 +48,11 @@
     <commons.jira.pid>12310460</commons.jira.pid>
     <!-- limit memory size see BEANUTILS-291; allow command-line override -->
     <!-- Originally 25M, increased to 56M to get round Continuum CI / Travis CI build failures -->
-    <surefire.argLine>-Xmx56M</surefire.argLine>
+    <surefire.argLine>-Xmx256M</surefire.argLine>
     <commons.japicmp.version>0.12.0</commons.japicmp.version>
     <commons.clirr.version>2.8</commons.clirr.version>
     <commons.encoding>utf-8</commons.encoding>
+    <commons.jacoco.version>0.8.2</commons.jacoco.version>
     <!-- Commons Release Plugin -->
     <commons.bc.version>2.0.0-SNAPSHOT</commons.bc.version>
     <commons.release.isDistModule>true</commons.release.isDistModule>
@@ -352,6 +353,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
             <configuration>
               <forkMode>pertest</forkMode>
 	      <!-- limit memory size see BEANUTILS-291 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 59ff11a..e03ae41 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -33,6 +33,9 @@
       <action issue="BEANUTILS-504" dev="ggregory" type="update" due-to="Gary Gregory">
         Update from Java 6 to 7.
       </action>
+      <action issue="BEANUTILS-515" dev="ggregory" type="update" due-to="Gary Gregory">
+        Update from Java 7 to 8.
+      </action>
       <action issue="BEANUTILS-503" dev="ggregory" type="update" due-to="Gary Gregory">
         Change packaging from org.apache.commons.beanutils to org.apache.commons.beanutils2.
       </action>
@@ -48,6 +51,9 @@
       <action issue="BEANUTILS-514" dev="ggregory" type="update" due-to="Gary Gregory">
         Remove deprecated code for 2.0.0.
       </action>
+      <action issue="BEANUTILS-509" dev="ggregory" type="update" due-to="sunil, Akshay Gehi">
+        WeakHashmap enters into infinite loop in WrapDynaClass.java.
+      </action>
     </release>
 
     <release version="1.9.3" date="2016-09-21" description="Bug fix release, now builds with Java 8">