Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'hotfix/heroku-build' into 'master'

Browse Source 
Fixing Heroku build that's failing because of git-commit-id maven plugin

See merge request theappsmith/internal-tools-server!42
This commit is contained in:
Arpit Mohan 2019-10-17 04:07:07 +00:00
commit a10a707ec0
4 changed files with 1 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/server/.gitlab-ci.yml
View File

@ -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

45
app/server/appsmith-interfaces/pom.xml
View File

@ -73,49 +73,4 @@
</dependencies>
<build>
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
<plugins>
<!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

5
app/server/appsmith-server/pom.xml
View File

@ -110,11 +110,6 @@
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
</dependency>
<dependency>
<groupId>com.segment.analytics.java</groupId>
<artifactId>analytics</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>

28
app/server/pom.xml
View File

@ -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>