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

Revert RestAPI plugin signature timeout fix (#2748)

Browse Source
This commit is contained in:
Shrikant Sharat Kandula 2021-01-27 17:24:25 +05:30 committed by GitHub
parent 35e66360e2
commit 350aea90c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app/server/appsmith-plugins/restApiPlugin/pom.xml
View File

@ -4,6 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.external.plugins</groupId> <groupId>com.external.plugins</groupId>
<artifactId>restApiPlugin</artifactId> <artifactId>restApiPlugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
@ -40,14 +47,8 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId> <artifactId>spring-webflux</artifactId>
<version>5.2.3.RELEASE</version> <version>5.1.13.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<version>2.2.4.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
@ -58,14 +59,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>jackson-core</artifactId> <artifactId>spring-boot-starter-webflux</artifactId>
<version>2.10.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.10.2</version>
</dependency> </dependency>
<dependency> <dependency>
@ -111,7 +106,6 @@
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>
<version>3.13.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -133,33 +127,31 @@
</dependencies> </dependencies>
<!--
This doesn't use the maven-shade-plugin because it inherits from spring-boot-starter-parent
for it's dependency on webclient. This is a normal compile.
-->
<build> <build>
<plugins> <plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.4</version> <version>3.1.2</version>
<configuration> <configuration>
<minimizeJar>false</minimizeJar> <archive>
<transformers> <manifestEntries>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <Plugin-Id>${plugin.id}</Plugin-Id>
<manifestEntries> <Plugin-Class>${plugin.class}</Plugin-Class>
<Plugin-Id>${plugin.id}</Plugin-Id> <Plugin-Version>${plugin.version}</Plugin-Version>
<Plugin-Class>${plugin.class}</Plugin-Class> <Plugin-Provider>${plugin.provider}</Plugin-Provider>
<Plugin-Version>${plugin.version}</Plugin-Version> <Plugin-Dependencies>${plugin.dependencies}</Plugin-Dependencies>
<Plugin-Provider>${plugin.provider}</Plugin-Provider> </manifestEntries>
</manifestEntries> </archive>
</transformer>
</transformers>
</configuration> </configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>