From 7b4d59d1227c189f795a8ff907c4144fe171f2a9 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Mon, 14 Oct 2024 12:03:57 +0300 Subject: [PATCH] [fix][build] Add basic support for vscode-java and Eclipse IDE (#23448) (cherry picked from commit 209fd784765916e28d38e50e52f6ed90d47527fd) (cherry picked from commit 323cf35c8ccfdee84f0a82c0f736b3d2da74e8e9) --- .gitignore | 2 ++ pom.xml | 46 ++++++++++++++++++++++++++ pulsar-broker/pom.xml | 19 +++++++++++ pulsar-common/pom.xml | 32 ++++++++++++++++++ pulsar-transaction/coordinator/pom.xml | 34 +++++++++++++++++-- 5 files changed, 131 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 80d760cd29df7..fe6e44915e628 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,5 @@ test-reports/ .mvn/.gradle-enterprise/ # Gradle Develocity .mvn/.develocity/ +.vscode +effective-pom.xml diff --git a/pom.xml b/pom.xml index 689b569bd69a1..33f9ced9f1cd7 100644 --- a/pom.xml +++ b/pom.xml @@ -307,6 +307,7 @@ flexible messaging model and an intuitive client API. 0.1.4 1.3 0.4 + 3.6.0 10.0.2 1.2.0 1.6.1 @@ -1803,6 +1804,7 @@ flexible messaging model and an intuitive client API. generated-site/** **/*.md **/.idea/** + **/.vscode/** **/.mvn/** **/generated/** **/zk-3.5-test-data/* @@ -1947,6 +1949,7 @@ flexible messaging model and an intuitive client API. **/SecurityAuth.audit* **/site2/** **/.idea/** + **/.vscode/** **/.mvn/** **/*.a **/*.so @@ -2150,6 +2153,49 @@ flexible messaging model and an intuitive client API. + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [1.0.0,) + + copy + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [1.0.0,) + + unpack + + + + + + + + + + diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index 3f15a39a48932..b969d59178211 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -671,6 +671,25 @@ + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + add-source + generate-sources + + add-source + + + + target/generated-sources/lightproto/java + + + + + maven-resources-plugin diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml index 5ae759d6a3c6b..4aea1fee39efc 100644 --- a/pulsar-common/pom.xml +++ b/pulsar-common/pom.xml @@ -290,6 +290,38 @@ + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + add-source + generate-sources + + add-source + + + + target/generated-sources/protobuf/java + + + + + add-test-source + generate-sources + + add-test-source + + + + target/generated-test-sources/protobuf/java + + + + + + pl.project13.maven diff --git a/pulsar-transaction/coordinator/pom.xml b/pulsar-transaction/coordinator/pom.xml index 78914486011b1..48710a8192fba 100644 --- a/pulsar-transaction/coordinator/pom.xml +++ b/pulsar-transaction/coordinator/pom.xml @@ -61,7 +61,7 @@ - + @@ -117,7 +117,37 @@ - + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + add-source + generate-sources + + add-source + + + + target/generated-sources/protobuf/java + + + + + add-test-source + generate-sources + + add-test-source + + + + target/generated-test-sources/protobuf/java + + + + + com.github.spotbugs spotbugs-maven-plugin