diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml index 0e20a0bb5f..1e43ec1d51 100644 --- a/core/core-backend/pom.xml +++ b/core/core-backend/pom.xml @@ -5,7 +5,7 @@ core io.dataease - 2.2.0 + ${dataease.version} 4.0.0 @@ -16,12 +16,12 @@ io.dataease api-base - ${project.version} + ${dataease.version} io.dataease api-permissions - ${project.version} + ${dataease.version} com.mysql diff --git a/core/core-frontend/pom.xml b/core/core-frontend/pom.xml index 39feb12c59..4bb88670f4 100644 --- a/core/core-frontend/pom.xml +++ b/core/core-frontend/pom.xml @@ -5,7 +5,7 @@ core io.dataease - 2.2.0 + ${dataease.version} 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index bebdccc5a4..304f829475 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ dataease io.dataease - 2.2.0 + ${dataease.version} 4.0.0 diff --git a/de-xpack b/de-xpack index e2a179cff0..d17d3775de 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit e2a179cff0c86af963a77520e332d962b02a77a8 +Subproject commit d17d3775defcb7bbe2603121a417982a0811af4f diff --git a/pom.xml b/pom.xml index ce1f115337..017a46cfd1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 io.dataease dataease - 2.2.0 + ${dataease.version} pom @@ -13,7 +13,7 @@ - 2.2.0 + 2.3.0 17 UTF-8 2022.0.0.0-RC1 @@ -40,6 +40,9 @@ 3.3.2 3.1.2 3.2.0 + 1.3.0 + 3.3.1 + 3.1.0 @@ -164,10 +167,46 @@ maven-clean-plugin ${maven.clean.version} + + org.apache.maven.plugins + maven-resources-plugin + ${maven.resources.version} + + + org.codehaus.mojo + exec-maven-plugin + ${maven.exec.version} + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven.version} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten-clean + clean + + clean + + + + + - diff --git a/sdk/api/api-base/pom.xml b/sdk/api/api-base/pom.xml index 5aa9989230..7ebba2167d 100644 --- a/sdk/api/api-base/pom.xml +++ b/sdk/api/api-base/pom.xml @@ -5,7 +5,7 @@ api io.dataease - 2.2.0 + ${dataease.version} 4.0.0 diff --git a/sdk/api/api-permissions/pom.xml b/sdk/api/api-permissions/pom.xml index 5c98b7f05e..7efab60ca8 100644 --- a/sdk/api/api-permissions/pom.xml +++ b/sdk/api/api-permissions/pom.xml @@ -5,7 +5,7 @@ api io.dataease - 2.2.0 + ${dataease.version} 4.0.0 diff --git a/sdk/api/pom.xml b/sdk/api/pom.xml index cafa0c48dd..58186de6bd 100644 --- a/sdk/api/pom.xml +++ b/sdk/api/pom.xml @@ -5,7 +5,7 @@ sdk io.dataease - 2.2.0 + ${dataease.version} 4.0.0 diff --git a/sdk/common/pom.xml b/sdk/common/pom.xml index b77d061fa4..1356fbc994 100644 --- a/sdk/common/pom.xml +++ b/sdk/common/pom.xml @@ -5,7 +5,7 @@ sdk io.dataease - 2.2.0 + ${dataease.version} 4.0.0 diff --git a/sdk/distributed/pom.xml b/sdk/distributed/pom.xml index 9216b4b9a4..bc0a6f8603 100644 --- a/sdk/distributed/pom.xml +++ b/sdk/distributed/pom.xml @@ -5,7 +5,7 @@ sdk io.dataease - 2.2.0 + ${dataease.version} 4.0.0 diff --git a/sdk/pom.xml b/sdk/pom.xml index d8d4c0ee68..36ca599108 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -5,7 +5,7 @@ dataease io.dataease - 2.2.0 + ${dataease.version} 4.0.0