Heroku fixes

- use public_test on heroku - remove cleaning step in core. Doesn't seem to be necessary anymore and it's giving some conflicts with maven-external-version-plugin
kurt-mueller-osumc · Dec 7, 2018 · 4b178bd · 4b178bd
1 parent 9564d21
commit 4b178bd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 35 deletions.
diff --git a/app.json b/app.json
@@ -21,7 +21,7 @@
     },
     "SPRING_OPTS": {
         "description":"set spring properties with e.g. -Dshow.civic=true (TODO: not all props work atm)",
-        "value":"-Dauthenticate=false -Dtomcat.catalina.scope=runtime -Ddb.user=cbio_user -Ddb.password=cbio_pass -Ddb.portal_db_name=public_test_small -Ddb.connection_string=jdbc:mysql://devdb.cbioportal.org:3306/ -Ddb.host=devdb.cbioportal.org -Dshow.civic=true -Ddbconnector=dbcp -Dsuppress_schema_version_mismatch_errors=true"
+        "value":"-Dauthenticate=false -Dtomcat.catalina.scope=runtime -Ddb.user=cbio_user -Ddb.password=cbio_pass -Ddb.portal_db_name=public_test -Ddb.connection_string=jdbc:mysql://devdb.cbioportal.org:3306/ -Ddb.host=devdb.cbioportal.org -Dshow.civic=true -Ddbconnector=dbcp -Dsuppress_schema_version_mismatch_errors=true"
     }
   },
   "buildpacks": [

diff --git a/core/pom.xml b/core/pom.xml
@@ -292,38 +292,6 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>heroku</id>
-      <build>
-        <plugins>
-          <!-- remove core temp build files -->
-          <plugin>
-            <artifactId>maven-clean-plugin</artifactId>
-            <version>2.5</version>
-            <executions>
-              <execution>
-                <id>clean-artifacts</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>clean</goal>
-                </goals>
-                <configuration>
-                  <excludeDefaultDirectories>true</excludeDefaultDirectories>
-                  <filesets>
-                    <fileset>
-                      <directory>target</directory>
-                    </fileset>
-                  </filesets>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
   <build>
     <plugins>
       <!-- surefire (test) config -->

diff --git a/version.sh b/version.sh
@@ -2,8 +2,8 @@
 if [ -n "$PROJECT_VERSION" ]; then
     # use env variable PROJECT_VERSION if defined
     echo $PROJECT_VERSION
-elif ! [ -x "$(command -v git)" ]; then
-    # git is not installed, 
+elif ! [ -x "$(command -v git)" ] || ! [ -d .git ]; then
+	# git is not installed, or not in a git repo
     echo '0-unknown-version'
 else
 	# get human readable commit id from git