diff --git a/RELEASE_NOTES.html b/RELEASE_NOTES.html
index 8ffe03c..36a181f 100644
--- a/RELEASE_NOTES.html
+++ b/RELEASE_NOTES.html
@@ -65,8 +65,6 @@
 </li>
 <li>[<a href='https://issues.apache.org/jira/browse/JUDDI-986'>JUDDI-986</a>] -         Update hibernate dependencies
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-988'>JUDDI-988</a>] -         Update to tomcat 8 
-</li>
 </ul>
                                                                                 
 <h2>        Task
diff --git a/juddi-ddl-generator/pom.xml b/juddi-ddl-generator/pom.xml
index f7b7158..b7db983 100644
--- a/juddi-ddl-generator/pom.xml
+++ b/juddi-ddl-generator/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.juddi</groupId>
             <artifactId>juddi-core</artifactId>
-            <version>3.3.6-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
diff --git a/juddi-examples/ValueSetValidator/pom.xml b/juddi-examples/ValueSetValidator/pom.xml
index 3169785..7c5659c 100644
--- a/juddi-examples/ValueSetValidator/pom.xml
+++ b/juddi-examples/ValueSetValidator/pom.xml
@@ -16,26 +16,25 @@
 	</parent>
 
 	<artifactId>example-vsv-validator</artifactId>
-	<version>3.3.5-SNAPSHOT</version>
 	<name>jUDDI Example Value Set Validator</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>uddi-ws</artifactId>
-			<version>3.3.5-SNAPSHOT</version>
+			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>juddi-client</artifactId>
-			<version>3.3.5-SNAPSHOT</version>
+			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 	
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>juddi-core</artifactId>
-			<version>3.3.5-SNAPSHOT</version>
+			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/juddi-examples/more-uddi-samples/pom.xml b/juddi-examples/more-uddi-samples/pom.xml
index e9181d9..fe8541b 100644
--- a/juddi-examples/more-uddi-samples/pom.xml
+++ b/juddi-examples/more-uddi-samples/pom.xml
@@ -24,7 +24,6 @@
     </parent>
     <groupId>org.apache.juddi</groupId>
     <artifactId>juddi-more-samples</artifactId>
-    <version>3.3.5-SNAPSHOT</version>
     <name>jUDDI Even More Examples and Samples</name>
     <url>http://maven.apache.org</url>
     <properties>
diff --git a/juddi-examples/service-version/pom.xml b/juddi-examples/service-version/pom.xml
index 3c1fbc8..55fe248 100644
--- a/juddi-examples/service-version/pom.xml
+++ b/juddi-examples/service-version/pom.xml
@@ -24,7 +24,6 @@
 	</parent>
 	<groupId>org.apache.juddi</groupId>
 	<artifactId>service-version</artifactId>
-	<version>3.3.4-SNAPSHOP</version>
 	<name>jUDDI Example Service Versioning</name>
 	<url>http://maven.apache.org</url>
 	<properties>
@@ -39,7 +38,7 @@
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>juddi-client</artifactId>
-			<version>3.3.5-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/juddi-examples/subscription-notification-amqp/pom.xml b/juddi-examples/subscription-notification-amqp/pom.xml
index f301909..02f6e0d 100644
--- a/juddi-examples/subscription-notification-amqp/pom.xml
+++ b/juddi-examples/subscription-notification-amqp/pom.xml
@@ -14,9 +14,7 @@
 		<artifactId>juddi-examples</artifactId>
 		<version>3.3.5-SNAPSHOT</version>
 	</parent>
-
 	<artifactId>subscription-notification-amqp</artifactId>
-	<version>3.3.5-SNAPSHOT</version>
 	<name>jUDDI Example AMQP Notifier for Subscription callbacks</name>
 	<description>Demonstrates how to write a custom notifier for subscriptions</description>
 	<dependencies>
diff --git a/juddi-examples/uddiv2-api-bridge-example/pom.xml b/juddi-examples/uddiv2-api-bridge-example/pom.xml
index 2833c13..378cd54 100644
--- a/juddi-examples/uddiv2-api-bridge-example/pom.xml
+++ b/juddi-examples/uddiv2-api-bridge-example/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <groupId>org.apache.juddi.example</groupId>
   <artifactId>uddiv2-api-bridge-example</artifactId>
-  <version>3.3.5-SNAPSHOT</version>
   <name>jUDDI Example Access UDDIv2 using Transport Adapter</name>
   <url>http://maven.apache.org</url>
   <properties>
diff --git a/juddi-tomcat/server.xml b/juddi-tomcat/server.xml
index fce8922..26126ab 100644
--- a/juddi-tomcat/server.xml
+++ b/juddi-tomcat/server.xml
@@ -26,6 +26,8 @@
   -->
   <!--APR library loader. Documentation at /docs/apr.html -->
   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+  <Listener className="org.apache.catalina.core.JasperListener"/>
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
   <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
diff --git a/pom.xml b/pom.xml
index 58da79a..58bd0eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<cxf.version>2.7.18</cxf.version>
 		<springframework.version>3.2.18.RELEASE</springframework.version>
-		<apache.tomcat.version>8.5.23</apache.tomcat.version>
+		<apache.tomcat.version>7.0.82</apache.tomcat.version>
 		<jacoco.it.execution.data.file>${project.build.directory}/coverage-reports/jacoco-it.exec</jacoco.it.execution.data.file>
 		<jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file>
 
diff --git a/uddi-tck/pom.xml b/uddi-tck/pom.xml
index 9e7c60b..62e0d1c 100644
--- a/uddi-tck/pom.xml
+++ b/uddi-tck/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.juddi</groupId>
 		<artifactId>juddi-parent</artifactId>
-		<version>3.3.6-SNAPSHOT</version>
+		<version>3.3.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>uddi-tck</artifactId>
 	<packaging>jar</packaging>
@@ -208,7 +208,7 @@
 						<configuration>
 							<wait>false</wait>
 							<container>
-								<containerId>tomcat8x</containerId>
+								<containerId>tomcat7x</containerId>
 								<home>${basedir}/target/juddi-tomcat-${project.parent.version}</home>
 							</container>
 							<configuration>
@@ -234,7 +234,7 @@
 						<configuration>
 							<wait>false</wait>
 							<container>
-								<containerId>tomcat8x</containerId>
+								<containerId>tomcat7x</containerId>
 								<home>${basedir}/target/node2/juddi-tomcat-${project.parent.version}</home>
 							</container>
 							<configuration>
@@ -258,7 +258,7 @@
 						<phase>post-integration-test</phase>
 						<configuration>
 							<container>
-								<containerId>tomcat8x</containerId>
+								<containerId>tomcat7x</containerId>
 							</container>
 							<configuration>
 								<properties>
@@ -277,7 +277,7 @@
 						<phase>post-integration-test</phase>
 						<configuration>
 							<container>
-								<containerId>tomcat8x</containerId>
+								<containerId>tomcat7x</containerId>
 							</container>
 							<configuration>
 								<properties>
diff --git a/uddi-tck/server.xml b/uddi-tck/server.xml
index d13e663..3a54792 100644
--- a/uddi-tck/server.xml
+++ b/uddi-tck/server.xml
@@ -26,7 +26,8 @@
   -->
   <!--APR library loader. Documentation at /docs/apr.html -->
   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-  
+  <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+  <Listener className="org.apache.catalina.core.JasperListener"/>
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
   <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
diff --git a/uddi-tck/serverNode2.xml b/uddi-tck/serverNode2.xml
index e4362d5..6288200 100644
--- a/uddi-tck/serverNode2.xml
+++ b/uddi-tck/serverNode2.xml
@@ -26,7 +26,8 @@
   -->
   <!--APR library loader. Documentation at /docs/apr.html -->
   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-  
+  <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+  <Listener className="org.apache.catalina.core.JasperListener"/>
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
   <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />