From d295875ee33ba0e7bb83d4fa5d4fc28f4bf0b5c2 Mon Sep 17 00:00:00 2001
From: Arpit Mohan <arpit@appsmith.com>
Date: Thu, 17 Oct 2019 09:18:17 +0530
Subject: [PATCH] Removing the git-commit plugin because it doesn't run
 properly on heroku

---
 app/server/.gitlab-ci.yml |  3 +--
 app/server/pom.xml        | 28 ----------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/app/server/.gitlab-ci.yml b/app/server/.gitlab-ci.yml
index f95965f80d..7ba080588d 100644
--- a/app/server/.gitlab-ci.yml
+++ b/app/server/.gitlab-ci.yml
@@ -41,9 +41,8 @@ maven-build:
 docker-package:
   stage: package
   script:
-    - docker build -t $DOCKER_IMAGE_NAME .
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
-    - docker push $DOCKER_IMAGE_NAME
+    - mvn package -DskipTests -DskipDockerBuild=false
   only:
     - master
 
diff --git a/app/server/pom.xml b/app/server/pom.xml
index 54c80097dd..7a1d0950b4 100644
--- a/app/server/pom.xml
+++ b/app/server/pom.xml
@@ -40,30 +40,6 @@
         </resources>
 
         <plugins>
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>2.2.5</version>
-                <executions>
-                    <execution>
-                        <id>get-the-git-infos</id>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                        <!-- *NOTE*: The default phase of revision is initialize, but in case you want to change it, you can do so by adding the phase here -->
-                        <phase>initialize</phase>
-                    </execution>
-                    <execution>
-                        <id>validate-the-git-infos</id>
-                        <goals>
-                            <goal>validateRevision</goal>
-                        </goals>
-                        <!-- *NOTE*: The default phase of validateRevision is verify, but in case you want to change it, you can do so by adding the phase here -->
-                        <phase>package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-
             <!--
                 This plugin optimizes the docker container for updates by making the incremental
                 layers smaller. Refer: https://phauer.com/2019/no-fat-jar-in-docker-image/
@@ -81,10 +57,6 @@
                             structure of Docker hub. Will move it to Appsmith's org account once that is resolved.
                          -->
                         <image>docker.io/arpitappsmith/appsmith-server</image>
-                        <!-- optional: create a tag based on the git commit id (via the git-commit-id plugin): -->
-                        <tags>
-                            <tag>${git.commit.id}</tag>
-                        </tags>
                     </to>
                     <container>
                         <jvmFlags>