6faaa33936
* core workflows of git - branch, clone, commit, pull, merge, status, log * Rehydrate file system before merge operation * Add logic to handle merge conflict for merge and pull flow * Add defaultBranch to listBranch API * Add Unit tests for git commands * Upgrade JGit dependencies to fix the security issue * Git command tests * Revert unwanted changes and update delete application flow * Disable git feature until the FE changes are merged Co-authored-by: Abhijeet <ABHI.NAGARNAIK@GMAIL.COM>
115 lines
3.8 KiB
XML
115 lines
3.8 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<parent>
|
|
<artifactId>integrated</artifactId>
|
|
<groupId>com.appsmith</groupId>
|
|
<version>1.0-SNAPSHOT</version>
|
|
</parent>
|
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<groupId>com.appsmith</groupId>
|
|
<artifactId>appsmith-git</artifactId>
|
|
<version>1.0-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
<name>appsmith-git</name>
|
|
<description>This is the git server to handle all the git operations</description>
|
|
|
|
<properties>
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
<java.version>11</java.version>
|
|
</properties>
|
|
|
|
<repositories>
|
|
<repository>
|
|
<id>jgit-repository</id>
|
|
<url>https://repo.eclipse.org/content/groups/releases/</url>
|
|
</repository>
|
|
</repositories>
|
|
|
|
<dependencies>
|
|
|
|
<dependency>
|
|
<groupId>org.projectlombok</groupId>
|
|
<artifactId>lombok</artifactId>
|
|
<version>1.18.8</version>
|
|
<scope>provided</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.eclipse.jgit</groupId>
|
|
<artifactId>org.eclipse.jgit</artifactId>
|
|
<version>5.13.0.202109080827-r</version>
|
|
</dependency>
|
|
|
|
<!-- https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit.ssh.jsch -->
|
|
<dependency>
|
|
<groupId>org.eclipse.jgit</groupId>
|
|
<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
|
|
<version>5.13.0.202109080827-r</version>
|
|
</dependency>
|
|
|
|
|
|
<!-- Test Dependencies -->
|
|
<dependency>
|
|
<groupId>junit</groupId>
|
|
<artifactId>junit</artifactId>
|
|
<version>4.13.1</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<!-- https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit.junit.ssh -->
|
|
<dependency>
|
|
<groupId>org.eclipse.jgit</groupId>
|
|
<artifactId>org.eclipse.jgit.junit.ssh</artifactId>
|
|
<version>5.13.0.202109080827-r</version>
|
|
</dependency>
|
|
|
|
|
|
<dependency>
|
|
<groupId>io.projectreactor</groupId>
|
|
<artifactId>reactor-test</artifactId>
|
|
<version>3.2.11.RELEASE</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.mockito</groupId>
|
|
<artifactId>mockito-core</artifactId>
|
|
<version>3.1.0</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.appsmith</groupId>
|
|
<artifactId>interfaces</artifactId>
|
|
<version>1.0-SNAPSHOT</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-test</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<artifactId>maven-dependency-plugin</artifactId>
|
|
<executions>
|
|
<execution>
|
|
<id>copy-dependencies</id>
|
|
<phase>package</phase>
|
|
<goals>
|
|
<goal>copy-dependencies</goal>
|
|
</goals>
|
|
<configuration>
|
|
<includeScope>runtime</includeScope>
|
|
<outputDirectory>${project.build.directory}/lib</outputDirectory>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
|
|
</project> |