diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/UpdateApplication_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/UpdateApplication_spec.js index 692a6de4f3..061cb51910 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/UpdateApplication_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/UpdateApplication_spec.js @@ -2,7 +2,7 @@ const homePage = require("../../../../locators/HomePage.json"); const commonlocators = require("../../../../locators/commonlocators.json"); import tinycolor from "tinycolor2"; -describe("Update Application", function() { +describe("Update Application", () => { let appname; let iconname; let colorname; @@ -10,7 +10,7 @@ describe("Update Application", function() { .toString(36) .slice(2, -1)}`; - it("Open the application menu and update name and then check whether update is reflected in the application card", function() { + it("Open the application menu and update name and then check whether update is reflected in the application card", () => { cy.get(commonlocators.homeIcon).click({ force: true }); appname = localStorage.getItem("AppName"); cy.get(homePage.searchInput).clear(); @@ -25,7 +25,6 @@ describe("Update Application", function() { .first() .click({ force: true }); cy.get(homePage.applicationName).type(`${appname} updated` + "{enter}"); - cy.get(homePage.toastMessage).should("contain", "Application name updated"); cy.wait("@updateApplication").should( "have.nested.property", "response.body.responseMeta.status", @@ -34,7 +33,7 @@ describe("Update Application", function() { cy.get(homePage.applicationCardName).should("contain", appname); }); - it("Open the application menu and update icon and then check whether update is reflected in the application card", function() { + it("Open the application menu and update icon and then check whether update is reflected in the application card", () => { cy.get(homePage.applicationIconSelector) .first() .click(); @@ -52,7 +51,7 @@ describe("Update Application", function() { }); }); - it("Check for errors in updating application name", function() { + it("Check for errors in updating application name", () => { cy.get(commonlocators.homeIcon).click({ force: true }); cy.get(homePage.searchInput).clear(); cy.get(homePage.searchInput).type(appname); @@ -82,10 +81,9 @@ describe("Update Application", function() { "response.body.data.name", `${appname} updated`, ); - cy.get(homePage.toastMessage).should("contain", "Application name updated"); }); - it("Updates the name of first application to very long name and checks whether update is reflected in the application card with a popover", function() { + it("Updates the name of first application to very long name and checks whether update is reflected in the application card with a popover", () => { cy.get(commonlocators.homeIcon).click({ force: true }); cy.get(homePage.searchInput).clear(); // eslint-disable-next-line cypress/no-unnecessary-waiting diff --git a/app/client/src/sagas/ApplicationSagas.tsx b/app/client/src/sagas/ApplicationSagas.tsx index 913dd9c4d1..d3bbf7fd58 100644 --- a/app/client/src/sagas/ApplicationSagas.tsx +++ b/app/client/src/sagas/ApplicationSagas.tsx @@ -47,7 +47,6 @@ import { } from "actions/applicationActions"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { - APPLICATION_NAME_UPDATE, createMessage, DELETING_APPLICATION, DUPLICATING_APPLICATION, @@ -298,12 +297,6 @@ export function* updateApplicationSaga( payload: action.payload, }); } - if (isValidResponse && request && request.name) { - Toaster.show({ - text: createMessage(APPLICATION_NAME_UPDATE), - variant: Variant.success, - }); - } if (isValidResponse && request.currentApp) { yield put({ type: ReduxActionTypes.CURRENT_APPLICATION_NAME_UPDATE, diff --git a/app/server/appsmith-plugins/amazons3Plugin/pom.xml b/app/server/appsmith-plugins/amazons3Plugin/pom.xml index c20790999a..b5f94fb228 100644 --- a/app/server/appsmith-plugins/amazons3Plugin/pom.xml +++ b/app/server/appsmith-plugins/amazons3Plugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins amazons3Plugin 1.0-SNAPSHOT @@ -36,27 +41,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - - com.amazonaws aws-java-sdk-s3 @@ -69,25 +53,7 @@ - - junit - junit - 4.13.1 - test - - - io.projectreactor - reactor-test - 3.2.11.RELEASE - test - - - org.mockito - mockito-core - 3.1.0 - test - @@ -96,25 +62,26 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/arangoDBPlugin/pom.xml b/app/server/appsmith-plugins/arangoDBPlugin/pom.xml index d8d6951c87..a3f026a20e 100644 --- a/app/server/appsmith-plugins/arangoDBPlugin/pom.xml +++ b/app/server/appsmith-plugins/arangoDBPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins arangodbPlugin 1.0-SNAPSHOT @@ -24,27 +29,6 @@ - - org.pf4j - pf4j-spring - 0.6.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - - com.arangodb arangodb-java-driver @@ -69,21 +53,6 @@ arangodb-testcontainer 1.3.0 - - - junit - junit - 4.13.1 - test - - - - io.projectreactor - reactor-test - 3.3.5.RELEASE - test - - org.testcontainers testcontainers @@ -99,26 +68,27 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/dynamoPlugin/pom.xml b/app/server/appsmith-plugins/dynamoPlugin/pom.xml index f1e46f165a..1b065c36fb 100644 --- a/app/server/appsmith-plugins/dynamoPlugin/pom.xml +++ b/app/server/appsmith-plugins/dynamoPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins dynamoPlugin 1.0-SNAPSHOT @@ -24,27 +29,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - - software.amazon.awssdk dynamodb @@ -63,13 +47,6 @@ - - junit - junit - 4.13.1 - test - - org.testcontainers testcontainers @@ -77,18 +54,6 @@ test - - io.projectreactor - reactor-test - 3.2.11.RELEASE - test - - - org.mockito - mockito-core - 3.1.0 - test - @@ -97,25 +62,26 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/elasticSearchPlugin/pom.xml b/app/server/appsmith-plugins/elasticSearchPlugin/pom.xml index e1f5b23f63..05201ddd45 100644 --- a/app/server/appsmith-plugins/elasticSearchPlugin/pom.xml +++ b/app/server/appsmith-plugins/elasticSearchPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins elasticSearchPlugin 1.0-SNAPSHOT @@ -24,27 +29,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - - org.elasticsearch.client elasticsearch-rest-client @@ -52,20 +36,6 @@ - - junit - junit - 4.13.1 - test - - - - io.projectreactor - reactor-test - 3.3.5.RELEASE - test - - org.testcontainers testcontainers @@ -88,25 +58,26 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/firestorePlugin/pom.xml b/app/server/appsmith-plugins/firestorePlugin/pom.xml index 362e11684f..fc363c2ee7 100644 --- a/app/server/appsmith-plugins/firestorePlugin/pom.xml +++ b/app/server/appsmith-plugins/firestorePlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins firestorePlugin 1.0-SNAPSHOT @@ -24,26 +29,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - com.google.firebase firebase-admin @@ -62,13 +47,6 @@ - - junit - junit - 4.13.1 - test - - org.testcontainers testcontainers @@ -82,18 +60,6 @@ test - - io.projectreactor - reactor-test - 3.2.11.RELEASE - test - - - org.mockito - mockito-core - 3.1.0 - test - @@ -102,35 +68,36 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml b/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml index 3182b97b0c..8f57d67d9f 100644 --- a/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml +++ b/app/server/appsmith-plugins/googleSheetsPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins googleSheetsPlugin 1.0-SNAPSHOT @@ -24,20 +29,6 @@ - - org.pf4j - pf4j-spring - 0.6.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - org.springframework spring-core @@ -72,12 +63,6 @@ - - org.projectlombok - lombok - 1.18.8 - - com.fasterxml.jackson.core jackson-databind @@ -138,19 +123,6 @@ - - junit - junit - 4.13.1 - test - - - - io.projectreactor - reactor-test - 3.3.5.RELEASE - test - org.mockito @@ -203,25 +175,26 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.version} - ${plugin.id} - ${plugin.class} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.version} + ${plugin.id} + ${plugin.class} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/jsPlugin/pom.xml b/app/server/appsmith-plugins/jsPlugin/pom.xml index 123ed06e7e..e2742a6336 100644 --- a/app/server/appsmith-plugins/jsPlugin/pom.xml +++ b/app/server/appsmith-plugins/jsPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins jsPlugin 1.0-SNAPSHOT @@ -24,20 +29,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - org.springframework spring-core @@ -80,25 +71,26 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/mongoPlugin/pom.xml b/app/server/appsmith-plugins/mongoPlugin/pom.xml index 157183fc74..26e11dba99 100644 --- a/app/server/appsmith-plugins/mongoPlugin/pom.xml +++ b/app/server/appsmith-plugins/mongoPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins mongoPlugin 1.0-SNAPSHOT @@ -24,47 +29,7 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - - - - junit - junit - 4.13.1 - test - - - - io.projectreactor - reactor-test - 3.2.11.RELEASE - test - - - org.mockito - mockito-core - 3.1.0 - test - org.testcontainers testcontainers @@ -80,25 +45,26 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/mssqlPlugin/pom.xml b/app/server/appsmith-plugins/mssqlPlugin/pom.xml index ca322c1218..92ac7b1d63 100644 --- a/app/server/appsmith-plugins/mssqlPlugin/pom.xml +++ b/app/server/appsmith-plugins/mssqlPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins mssqlPlugin 1.0-SNAPSHOT @@ -24,27 +29,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - - com.microsoft.sqlserver mssql-jdbc @@ -52,13 +36,6 @@ - - junit - junit - 4.13.1 - test - - org.testcontainers testcontainers @@ -72,18 +49,6 @@ test - - io.projectreactor - reactor-test - 3.2.11.RELEASE - test - - - org.mockito - mockito-core - 3.1.0 - test - @@ -92,35 +57,36 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + diff --git a/app/server/appsmith-plugins/mysqlPlugin/pom.xml b/app/server/appsmith-plugins/mysqlPlugin/pom.xml index f65a57865f..6ec236b555 100644 --- a/app/server/appsmith-plugins/mysqlPlugin/pom.xml +++ b/app/server/appsmith-plugins/mysqlPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins mysqlPlugin 1.0-SNAPSHOT @@ -23,26 +28,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - org.springframework.data @@ -91,14 +76,6 @@ 8.0.20 test - - - junit - junit - 4.13.1 - test - - org.testcontainers testcontainers @@ -119,27 +96,6 @@ 1.15.0-rc2 test - - - io.projectreactor - reactor-core - 3.3.2.RELEASE - provided - - - - io.projectreactor - reactor-test - 3.3.2.RELEASE - test - - - - org.mockito - mockito-core - 3.1.0 - test - @@ -148,25 +104,26 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/pom.xml b/app/server/appsmith-plugins/pom.xml index d1ead071b4..1b96e5fdac 100644 --- a/app/server/appsmith-plugins/pom.xml +++ b/app/server/appsmith-plugins/pom.xml @@ -9,10 +9,52 @@ 4.0.0 + com.appsmith appsmith-plugins 1.0-SNAPSHOT pom + + + org.pf4j + pf4j-spring + 0.7.0 + provided + + + com.appsmith + interfaces + 1.0-SNAPSHOT + provided + + + org.projectlombok + lombok + 1.18.8 + provided + + + + + junit + junit + 4.13.1 + test + + + io.projectreactor + reactor-test + 3.3.5.RELEASE + test + + + org.mockito + mockito-core + 3.1.0 + test + + + postgresPlugin restApiPlugin diff --git a/app/server/appsmith-plugins/postgresPlugin/pom.xml b/app/server/appsmith-plugins/postgresPlugin/pom.xml index 2666a17047..46e27d17d0 100644 --- a/app/server/appsmith-plugins/postgresPlugin/pom.xml +++ b/app/server/appsmith-plugins/postgresPlugin/pom.xml @@ -2,8 +2,14 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + + 4.0.0 com.external.plugins postgresPlugin 1.0-SNAPSHOT @@ -24,27 +30,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - - org.postgresql postgresql @@ -64,13 +49,6 @@ - - junit - junit - 4.13.1 - test - - org.testcontainers testcontainers @@ -83,19 +61,6 @@ 1.15.0-rc2 test - - - io.projectreactor - reactor-test - 3.2.11.RELEASE - test - - - org.mockito - mockito-core - 3.1.0 - test - @@ -104,25 +69,26 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/redisPlugin/pom.xml b/app/server/appsmith-plugins/redisPlugin/pom.xml index fed768d6a2..4f198e66fa 100644 --- a/app/server/appsmith-plugins/redisPlugin/pom.xml +++ b/app/server/appsmith-plugins/redisPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins redisPlugin 1.0-SNAPSHOT @@ -24,27 +29,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - - redis.clients jedis @@ -59,25 +43,6 @@ - - junit - junit - 4.13.1 - test - - - - io.projectreactor - reactor-test - 3.2.11.RELEASE - test - - - org.mockito - mockito-core - 3.1.0 - test - org.testcontainers testcontainers @@ -93,26 +58,27 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/redshiftPlugin/pom.xml b/app/server/appsmith-plugins/redshiftPlugin/pom.xml index 94337bbfd5..9f58e8b805 100644 --- a/app/server/appsmith-plugins/redshiftPlugin/pom.xml +++ b/app/server/appsmith-plugins/redshiftPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins redshiftPlugin 1.0-SNAPSHOT @@ -31,27 +36,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - - com.amazon.redshift redshift-jdbc42 @@ -60,12 +44,6 @@ - - junit - junit - 4.13.1 - test - org.hamcrest @@ -74,20 +52,6 @@ test - - io.projectreactor - reactor-test - 3.2.11.RELEASE - test - - - - org.mockito - mockito-core - 3.1.0 - test - - @@ -96,26 +60,25 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + *:* diff --git a/app/server/appsmith-plugins/restApiPlugin/pom.xml b/app/server/appsmith-plugins/restApiPlugin/pom.xml index 549fb8020a..6f1c2990bc 100644 --- a/app/server/appsmith-plugins/restApiPlugin/pom.xml +++ b/app/server/appsmith-plugins/restApiPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins restApiPlugin 1.0-SNAPSHOT @@ -24,20 +29,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - org.springframework spring-core @@ -72,12 +63,6 @@ - - org.projectlombok - lombok - 1.18.8 - - com.fasterxml.jackson.core jackson-databind @@ -114,27 +99,6 @@ - - junit - junit - 4.13.1 - test - - - - io.projectreactor - reactor-test - 3.3.5.RELEASE - test - - - - org.mockito - mockito-core - 3.1.0 - test - - org.assertj assertj-core @@ -179,25 +143,26 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/saasPlugin/pom.xml b/app/server/appsmith-plugins/saasPlugin/pom.xml index cef34082a4..1575b16597 100644 --- a/app/server/appsmith-plugins/saasPlugin/pom.xml +++ b/app/server/appsmith-plugins/saasPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins saasPlugin 1.0-SNAPSHOT @@ -24,20 +29,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - org.springframework spring-core @@ -71,18 +62,6 @@ - - org.projectlombok - lombok - RELEASE - compile - - - org.projectlombok - lombok - RELEASE - compile - @@ -92,25 +71,26 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/appsmith-plugins/smtpPlugin/pom.xml b/app/server/appsmith-plugins/smtpPlugin/pom.xml index 56dd8e5ba2..3c85fec5af 100644 --- a/app/server/appsmith-plugins/smtpPlugin/pom.xml +++ b/app/server/appsmith-plugins/smtpPlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins smtpPlugin 1.0-SNAPSHOT @@ -23,27 +28,6 @@ - - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - - - org.projectlombok - lombok - 1.18.8 - provided - javax.mail mail @@ -52,19 +36,6 @@ - - junit - junit - 4.13.1 - test - - - - io.projectreactor - reactor-test - 3.2.11.RELEASE - test - org.testcontainers @@ -80,35 +51,36 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + diff --git a/app/server/appsmith-plugins/snowflakePlugin/pom.xml b/app/server/appsmith-plugins/snowflakePlugin/pom.xml index c8f8046c31..7643d4eb69 100644 --- a/app/server/appsmith-plugins/snowflakePlugin/pom.xml +++ b/app/server/appsmith-plugins/snowflakePlugin/pom.xml @@ -2,8 +2,13 @@ - 4.0.0 + + com.appsmith + appsmith-plugins + 1.0-SNAPSHOT + + 4.0.0 com.external.plugins snowflakePlugin 1.0-SNAPSHOT @@ -24,20 +29,6 @@ - - org.pf4j - pf4j-spring - 0.7.0 - provided - - - - com.appsmith - interfaces - 1.0-SNAPSHOT - provided - - org.springframework spring-core @@ -78,12 +69,6 @@ 3.13.4 - - org.projectlombok - lombok - 1.18.8 - - com.fasterxml.jackson.core jackson-databind @@ -120,27 +105,6 @@ - - junit - junit - 4.13.1 - test - - - - io.projectreactor - reactor-test - 3.3.5.RELEASE - test - - - - org.mockito - mockito-core - 3.1.0 - test - - org.assertj assertj-core @@ -179,25 +143,26 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 - - false - - - - ${plugin.id} - ${plugin.class} - ${plugin.version} - ${plugin.provider} - - - - + shade-plugin-jar package shade + + false + + + + ${plugin.id} + ${plugin.class} + ${plugin.version} + ${plugin.provider} + + + + diff --git a/app/server/pom.xml b/app/server/pom.xml index e8b3ad3eb1..f586f13cde 100644 --- a/app/server/pom.xml +++ b/app/server/pom.xml @@ -24,6 +24,7 @@ 1.0-SNAPSHOT true + 2.17.0