This is an automated email from the ASF dual-hosted git repository.
pandaapo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 1b3e4962f [ISSUE#4496] Fix gradle dist error. (#4497)
1b3e4962f is described below
commit 1b3e4962fa6bdd543fdb000290dc1b1c06f07827
Author: yanrongzhen <[email protected]>
AuthorDate: Fri Oct 20 11:01:05 2023 +0800
[ISSUE#4496] Fix gradle dist error. (#4497)
* Fix gradle spotless task dependency bug when execute 'gradle dist'.
* revert settings.gradle
* revert protocol-grpc build.gradle
* Remove unused imports.
---
build.gradle | 10 +++++++++-
.../eventmesh-openconnect-offsetmgmt-plugin/build.gradle | 2 --
.../build.gradle | 3 +--
eventmesh-sdks/build.gradle | 3 +--
eventmesh-security-plugin/build.gradle | 3 +--
eventmesh-storage-plugin/build.gradle | 3 +--
eventmesh-trace-plugin/build.gradle | 3 +--
eventmesh-webhook/build.gradle | 1 -
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/build.gradle b/build.gradle
index 3991792dc..718e71366 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,7 +125,15 @@ allprojects {
removeUnusedImports()
}
}
- spotlessJava.dependsOn(compileJava, javadoc, compileTestJava, test,
processResources, processTestResources)
+
+ afterEvaluate {
+ tasks.forEach {task ->
+ if (task.name.contains("spotlessJava")) {
+ task.dependsOn(compileJava, javadoc, compileTestJava, test,
processResources, processTestResources)
+ }
+ }
+ spotlessJava.dependsOn(subprojects.collect {it.tasks["spotlessJava"] })
+ }
test {
useJUnitPlatform()
diff --git
a/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/build.gradle
b/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/build.gradle
index f49e74a13..07db9fff9 100644
--- a/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/build.gradle
+++ b/eventmesh-openconnect/eventmesh-openconnect-offsetmgmt-plugin/build.gradle
@@ -30,6 +30,4 @@ dependencies {
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
-
- spotlessJava.enabled false
}
\ No newline at end of file
diff --git a/eventmesh-storage-plugin/build.gradle
b/eventmesh-protocol-plugin/build.gradle
similarity index 96%
copy from eventmesh-storage-plugin/build.gradle
copy to eventmesh-protocol-plugin/build.gradle
index 813e69792..d973dceda 100644
--- a/eventmesh-storage-plugin/build.gradle
+++ b/eventmesh-protocol-plugin/build.gradle
@@ -13,5 +13,4 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
-spotlessJava.enabled false
\ No newline at end of file
+ */
\ No newline at end of file
diff --git a/eventmesh-sdks/build.gradle b/eventmesh-sdks/build.gradle
index d7ff6a123..d973dceda 100644
--- a/eventmesh-sdks/build.gradle
+++ b/eventmesh-sdks/build.gradle
@@ -13,5 +13,4 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
-spotlessJava.enabled=false
\ No newline at end of file
+ */
\ No newline at end of file
diff --git a/eventmesh-security-plugin/build.gradle
b/eventmesh-security-plugin/build.gradle
index d7ff6a123..d973dceda 100644
--- a/eventmesh-security-plugin/build.gradle
+++ b/eventmesh-security-plugin/build.gradle
@@ -13,5 +13,4 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
-spotlessJava.enabled=false
\ No newline at end of file
+ */
\ No newline at end of file
diff --git a/eventmesh-storage-plugin/build.gradle
b/eventmesh-storage-plugin/build.gradle
index 813e69792..d973dceda 100644
--- a/eventmesh-storage-plugin/build.gradle
+++ b/eventmesh-storage-plugin/build.gradle
@@ -13,5 +13,4 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
-spotlessJava.enabled false
\ No newline at end of file
+ */
\ No newline at end of file
diff --git a/eventmesh-trace-plugin/build.gradle
b/eventmesh-trace-plugin/build.gradle
index 813e69792..d973dceda 100644
--- a/eventmesh-trace-plugin/build.gradle
+++ b/eventmesh-trace-plugin/build.gradle
@@ -13,5 +13,4 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
-spotlessJava.enabled false
\ No newline at end of file
+ */
\ No newline at end of file
diff --git a/eventmesh-webhook/build.gradle b/eventmesh-webhook/build.gradle
index b9054d1e1..b461b7c92 100644
--- a/eventmesh-webhook/build.gradle
+++ b/eventmesh-webhook/build.gradle
@@ -35,5 +35,4 @@ task copyEventMeshAdmin(dependsOn: ['jar']) {
from "../eventmesh-webhook/dist/apps/eventmesh-webhook-receive.jar"
}
}
- spotlessJava.enabled false
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
