From 726de9654036858eb9cfbca35d394ff0406e70a2 Mon Sep 17 00:00:00 2001
From: JJ Gao <jianjiong.gao@gmail.com>
Date: Thu, 18 Aug 2016 17:36:32 -0400
Subject: [PATCH] put the setting in app.json

---
 app.json | 2 +-
 pom.xml  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app.json b/app.json
index 65f5b238490..eda5507f818 100644
--- a/app.json
+++ b/app.json
@@ -17,7 +17,7 @@
     },
     "MAVEN_CUSTOM_OPTS": {
         "description":"set heroku profile for mvn",
-        "value":"-Pheroku,public -DskipTests -Ddb.user=cbio_user -Ddb.password=cbio_pass -Ddb.portal_db_name=public_test -Ddb.connection_string=jdbc:mysql://cbioportal-public.c1xhhbwn8izk.us-east-1.rds.amazonaws.com:3306/ -Ddb.host=cbioportal-public.c1xhhbwn8izk.us-east-1.rds.amazonaws.com"
+        "value":"-Pheroku,public -DskipTests -Ddb.user=cbio_user -Ddb.password=cbio_pass -Ddb.portal_db_name=public_test -Dtomcat.catalina.scope=runtime -Ddb.connection_string=jdbc:mysql://cbioportal-public.c1xhhbwn8izk.us-east-1.rds.amazonaws.com:3306/ -Ddb.host=cbioportal-public.c1xhhbwn8izk.us-east-1.rds.amazonaws.com"
     }
   },
   "buildpacks": [
diff --git a/pom.xml b/pom.xml
index d13a03bdfdd..c1e1c3c549b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,10 +43,6 @@
     </profile>
     <profile>
       <id>heroku</id>
-      <properties>
-          <!--Our heroku instance uses jetty and therefore needs to include the tomcat lib-->
-          <tomcat.catalina.scope>runetime</tomcat.catalina.scope>
-      </properties>
 
       <build>
         <plugins>