This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch pom-modules-review in repository https://gitbox.apache.org/repos/asf/storm.git
commit 931c8a7a6c95a509669be84c50415e4e209888a7 Author: Richard Zowalla <[email protected]> AuthorDate: Tue Apr 28 11:45:51 2026 +0200 build: introduce aggregator modules and unify pom display names The storm-multilang/, storm-dist/, external/ and examples/ trees previously listed their children directly in the root pom (or its profiles) without an aggregator pom of their own, which broke the standard Maven multi-module shape (no `mvn -pl <group> -am` builds, no shared parent for grouped concerns) and made the root module list noisy. Pom display names were also inconsistent or missing across the tree. - Add aggregator poms: storm-multilang/pom.xml (storm-multilang), storm-dist/pom.xml (storm-dist), external/pom.xml (storm-external), examples/pom.xml (storm-examples). All four use packaging=pom and inherit from the storm root. - Repoint each child under those trees to its new aggregator parent (relativePath ../pom.xml). storm-dist/binary and storm-dist/source likewise declare storm-dist as parent. Children's own artifactId/groupId are not changed. - Collapse the root pom <modules> and the dist/externals/examples profiles to one entry per group (storm-multilang, storm-dist, external, examples). Profile activation semantics are preserved (externals and examples remain activeByDefault). - Normalize <name> across every pom to "Storm <Module>" (e.g. "Storm Client", "Storm Flux Core", "Storm Multilang JavaScript", "Storm Kafka Client", "Storm Starter"). Removes the mix of artifact-style lowercase names, "Apache Storm - X", developer-name false positives in poms with no project <name>, and the few duplicates that crept in. --- {storm-multilang/python => examples}/pom.xml | 32 +++++++++----------- examples/storm-hdfs-examples/pom.xml | 7 +++-- examples/storm-jdbc-examples/pom.xml | 7 +++-- examples/storm-jms-examples/pom.xml | 8 +++-- examples/storm-kafka-client-examples/pom.xml | 6 ++-- examples/storm-loadgen/pom.xml | 7 +++-- examples/storm-perf/pom.xml | 4 +-- examples/storm-redis-examples/pom.xml | 7 +++-- examples/storm-starter/pom.xml | 7 ++--- {storm-multilang/python => external}/pom.xml | 37 ++++++++++++----------- external/storm-autocreds/pom.xml | 6 ++-- external/storm-blobstore-migration/pom.xml | 8 +++-- external/storm-hdfs-blobstore/pom.xml | 7 +++-- external/storm-hdfs-oci/pom.xml | 6 ++-- external/storm-hdfs/pom.xml | 7 +++-- external/storm-jdbc/pom.xml | 7 +++-- external/storm-jms/pom.xml | 7 +++-- external/storm-kafka-client/pom.xml | 8 +++-- external/storm-kafka-migration/pom.xml | 8 +++-- external/storm-kafka-monitor/pom.xml | 8 ++--- external/storm-metrics-prometheus/pom.xml | 8 +++-- external/storm-metrics/pom.xml | 8 +++-- external/storm-redis/pom.xml | 7 +++-- flux/flux-core/pom.xml | 3 +- flux/flux-examples/pom.xml | 3 +- flux/flux-wrappers/pom.xml | 4 ++- flux/pom.xml | 2 +- integration-test/pom.xml | 1 - pom.xml | 30 +++--------------- storm-buildtools/storm-maven-plugins/pom.xml | 4 ++- storm-checkstyle/pom.xml | 2 +- storm-client/pom.xml | 4 ++- storm-core/pom.xml | 4 ++- storm-dist/binary/final-package/pom.xml | 4 ++- storm-dist/binary/pom.xml | 8 +++-- storm-dist/binary/storm-autocreds-bin/pom.xml | 2 ++ storm-dist/binary/storm-client-bin/pom.xml | 3 ++ storm-dist/binary/storm-kafka-monitor-bin/pom.xml | 2 ++ storm-dist/binary/storm-submit-tools-bin/pom.xml | 2 ++ storm-dist/binary/storm-webapp-bin/pom.xml | 3 ++ {storm-multilang/ruby => storm-dist}/pom.xml | 26 ++++++---------- storm-dist/source/pom.xml | 8 +++-- storm-multilang/javascript/pom.xml | 8 +++-- storm-multilang/{ruby => }/pom.xml | 27 ++++++----------- storm-multilang/python/pom.xml | 8 +++-- storm-multilang/ruby/pom.xml | 8 +++-- storm-server/pom.xml | 2 ++ storm-shaded-deps/pom.xml | 4 ++- storm-submit-tools/pom.xml | 2 ++ storm-webapp/pom.xml | 4 ++- 50 files changed, 219 insertions(+), 176 deletions(-) diff --git a/storm-multilang/python/pom.xml b/examples/pom.xml similarity index 66% copy from storm-multilang/python/pom.xml copy to examples/pom.xml index 2324e84d8..03517afed 100644 --- a/storm-multilang/python/pom.xml +++ b/examples/pom.xml @@ -15,30 +15,28 @@ See the License for the specific language governing permissions and limitations under the License. --> - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> <artifactId>storm</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> - <artifactId>multilang-python</artifactId> - <packaging>jar</packaging> - <name>multilang-python</name> + <artifactId>storm-examples</artifactId> + <packaging>pom</packaging> + <name>Storm Examples</name> + <description>Aggregator for Storm example topologies and load-generation tools.</description> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + <modules> + <module>storm-starter</module> + <module>storm-loadgen</module> + <module>storm-redis-examples</module> + <module>storm-kafka-client-examples</module> + <module>storm-jdbc-examples</module> + <module>storm-hdfs-examples</module> + <module>storm-jms-examples</module> + <module>storm-perf</module> + </modules> </project> diff --git a/examples/storm-hdfs-examples/pom.xml b/examples/storm-hdfs-examples/pom.xml index ed3c23a86..e21733ca6 100644 --- a/examples/storm-hdfs-examples/pom.xml +++ b/examples/storm-hdfs-examples/pom.xml @@ -19,14 +19,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-examples</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-hdfs-examples</artifactId> + + + <name>Storm HDFS Examples</name> <dependencies> <dependency> <groupId>org.apache.storm</groupId> diff --git a/examples/storm-jdbc-examples/pom.xml b/examples/storm-jdbc-examples/pom.xml index cec16ce83..2608db1fd 100644 --- a/examples/storm-jdbc-examples/pom.xml +++ b/examples/storm-jdbc-examples/pom.xml @@ -19,14 +19,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-examples</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-jdbc-examples</artifactId> + + + <name>Storm JDBC Examples</name> <dependencies> <dependency> <groupId>org.apache.storm</groupId> diff --git a/examples/storm-jms-examples/pom.xml b/examples/storm-jms-examples/pom.xml index 5cf4db6a9..fe6866277 100644 --- a/examples/storm-jms-examples/pom.xml +++ b/examples/storm-jms-examples/pom.xml @@ -19,15 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-examples</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-jms-examples</artifactId> + + + + <name>Storm JMS Examples</name> <properties> <spring.version>7.0.6</spring.version> </properties> diff --git a/examples/storm-kafka-client-examples/pom.xml b/examples/storm-kafka-client-examples/pom.xml index 0d2d959a9..e65574d2f 100644 --- a/examples/storm-kafka-client-examples/pom.xml +++ b/examples/storm-kafka-client-examples/pom.xml @@ -19,16 +19,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-examples</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>storm-kafka-client-examples</artifactId> + + <name>Storm Kafka Client Examples</name> <dependencies> <dependency> <groupId>org.slf4j</groupId> diff --git a/examples/storm-loadgen/pom.xml b/examples/storm-loadgen/pom.xml index cc36c69fa..40999d0ca 100644 --- a/examples/storm-loadgen/pom.xml +++ b/examples/storm-loadgen/pom.xml @@ -18,14 +18,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-examples</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-loadgen</artifactId> <packaging>jar</packaging> - <name>storm-loadgen</name> + <name>Storm LoadGen</name> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> diff --git a/examples/storm-perf/pom.xml b/examples/storm-perf/pom.xml index 60e73a8d4..584ff7abc 100644 --- a/examples/storm-perf/pom.xml +++ b/examples/storm-perf/pom.xml @@ -18,10 +18,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-examples</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-perf</artifactId> diff --git a/examples/storm-redis-examples/pom.xml b/examples/storm-redis-examples/pom.xml index e87da64fe..010b92d98 100644 --- a/examples/storm-redis-examples/pom.xml +++ b/examples/storm-redis-examples/pom.xml @@ -19,14 +19,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-examples</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-redis-examples</artifactId> + + + <name>Storm Redis Examples</name> <dependencies> <dependency> <groupId>org.apache.storm</groupId> diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml index 9e29e30d6..39d69397d 100644 --- a/examples/storm-starter/pom.xml +++ b/examples/storm-starter/pom.xml @@ -18,16 +18,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-examples</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-starter</artifactId> <packaging>jar</packaging> - - <name>storm-starter</name> + <name>Storm Starter</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/storm-multilang/python/pom.xml b/external/pom.xml similarity index 60% copy from storm-multilang/python/pom.xml copy to external/pom.xml index 2324e84d8..2b209673f 100644 --- a/storm-multilang/python/pom.xml +++ b/external/pom.xml @@ -15,30 +15,33 @@ See the License for the specific language governing permissions and limitations under the License. --> - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> <artifactId>storm</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> - <artifactId>multilang-python</artifactId> - <packaging>jar</packaging> - <name>multilang-python</name> + <artifactId>storm-external</artifactId> + <packaging>pom</packaging> + <name>Storm External</name> + <description>Aggregator for Storm external integrations.</description> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + <modules> + <module>storm-autocreds</module> + <module>storm-blobstore-migration</module> + <module>storm-hdfs</module> + <module>storm-hdfs-blobstore</module> + <module>storm-hdfs-oci</module> + <module>storm-jdbc</module> + <module>storm-jms</module> + <module>storm-kafka-client</module> + <module>storm-kafka-migration</module> + <module>storm-kafka-monitor</module> + <module>storm-metrics</module> + <module>storm-metrics-prometheus</module> + <module>storm-redis</module> + </modules> </project> diff --git a/external/storm-autocreds/pom.xml b/external/storm-autocreds/pom.xml index feb2d3484..dd1ecc963 100644 --- a/external/storm-autocreds/pom.xml +++ b/external/storm-autocreds/pom.xml @@ -17,15 +17,17 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>storm-autocreds</artifactId> + + <name>Storm Autocreds</name> <dependencies> <dependency> <groupId>org.apache.storm</groupId> diff --git a/external/storm-blobstore-migration/pom.xml b/external/storm-blobstore-migration/pom.xml index bd4301199..60a8a42fd 100644 --- a/external/storm-blobstore-migration/pom.xml +++ b/external/storm-blobstore-migration/pom.xml @@ -19,16 +19,18 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>blobstore-migrator</artifactId> + + + <name>Storm Blobstore Migration</name> <packaging>jar</packaging> - <name>blobstore-migrator</name> <url>https://maven.apache.org</url> <dependencies> diff --git a/external/storm-hdfs-blobstore/pom.xml b/external/storm-hdfs-blobstore/pom.xml index befa70df2..5246940fa 100644 --- a/external/storm-hdfs-blobstore/pom.xml +++ b/external/storm-hdfs-blobstore/pom.xml @@ -19,14 +19,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-hdfs-blobstore</artifactId> + + + <name>Storm HDFS Blobstore</name> <dependencies> <dependency> <groupId>org.slf4j</groupId> diff --git a/external/storm-hdfs-oci/pom.xml b/external/storm-hdfs-oci/pom.xml index dc8caeb2f..c53612853 100644 --- a/external/storm-hdfs-oci/pom.xml +++ b/external/storm-hdfs-oci/pom.xml @@ -17,15 +17,17 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>storm-hdfs-oci</artifactId> + + <name>Storm HDFS OCI</name> <dependencies> <dependency> <groupId>org.slf4j</groupId> diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml index cb146ea3a..fdd7b2066 100644 --- a/external/storm-hdfs/pom.xml +++ b/external/storm-hdfs/pom.xml @@ -19,14 +19,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-hdfs</artifactId> + + + <name>Storm HDFS</name> <dependencies> <dependency> <groupId>org.slf4j</groupId> diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml index 643c33d76..b6c96ee0e 100644 --- a/external/storm-jdbc/pom.xml +++ b/external/storm-jdbc/pom.xml @@ -19,14 +19,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-jdbc</artifactId> + + + <name>Storm JDBC</name> <developers> <developer> <id>Parth-Brahmbhatt</id> diff --git a/external/storm-jms/pom.xml b/external/storm-jms/pom.xml index 01607f87a..54088855c 100644 --- a/external/storm-jms/pom.xml +++ b/external/storm-jms/pom.xml @@ -18,14 +18,17 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-jms</artifactId> + + + <name>Storm JMS</name> <developers> <developer> <id>ptgoetz</id> diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml index 21a226738..6b9897b98 100644 --- a/external/storm-kafka-client/pom.xml +++ b/external/storm-kafka-client/pom.xml @@ -20,14 +20,16 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-kafka-client</artifactId> - <name>storm-kafka-client</name> + + + <name>Storm Kafka Client</name> <packaging>jar</packaging> diff --git a/external/storm-kafka-migration/pom.xml b/external/storm-kafka-migration/pom.xml index 28f00dbff..272882286 100644 --- a/external/storm-kafka-migration/pom.xml +++ b/external/storm-kafka-migration/pom.xml @@ -20,14 +20,16 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-kafka-migration</artifactId> - <name>storm-kafka-migration</name> + + + <name>Storm Kafka Migration</name> <packaging>jar</packaging> diff --git a/external/storm-kafka-monitor/pom.xml b/external/storm-kafka-monitor/pom.xml index 22149bfb7..16046f252 100644 --- a/external/storm-kafka-monitor/pom.xml +++ b/external/storm-kafka-monitor/pom.xml @@ -18,17 +18,15 @@ */--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>storm-kafka-monitor</artifactId> - <name>storm-kafka-monitor</name> - - + <name>Storm Kafka Monitor</name> <packaging>jar</packaging> <developers> diff --git a/external/storm-metrics-prometheus/pom.xml b/external/storm-metrics-prometheus/pom.xml index efd5f6f8b..233bcad90 100644 --- a/external/storm-metrics-prometheus/pom.xml +++ b/external/storm-metrics-prometheus/pom.xml @@ -18,16 +18,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-metrics-prometheus</artifactId> + + + <name>Storm Metrics Prometheus</name> <packaging>jar</packaging> - <name>storm-metrics-prometheus</name> <properties> <prometheus.client.version>1.5.1</prometheus.client.version> diff --git a/external/storm-metrics/pom.xml b/external/storm-metrics/pom.xml index 53de84bfa..b2c83c0e4 100644 --- a/external/storm-metrics/pom.xml +++ b/external/storm-metrics/pom.xml @@ -18,16 +18,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-metrics</artifactId> + + + <name>Storm Metrics</name> <packaging>jar</packaging> - <name>storm-metrics</name> <properties> <!-- settings for downloading the sigar native binary complete archive, which is not available in Maven central--> diff --git a/external/storm-redis/pom.xml b/external/storm-redis/pom.xml index ca822a16e..0a8e91e72 100644 --- a/external/storm-redis/pom.xml +++ b/external/storm-redis/pom.xml @@ -19,14 +19,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-external</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>storm-redis</artifactId> + + + <name>Storm Redis</name> <developers> <developer> <id>dashengju</id> diff --git a/flux/flux-core/pom.xml b/flux/flux-core/pom.xml index 822c49a5c..4aa9233a0 100644 --- a/flux/flux-core/pom.xml +++ b/flux/flux-core/pom.xml @@ -27,8 +27,7 @@ <artifactId>flux-core</artifactId> <packaging>jar</packaging> - - <name>flux-core</name> + <name>Storm Flux Core</name> <dependencies> <dependency> diff --git a/flux/flux-examples/pom.xml b/flux/flux-examples/pom.xml index 8a5907799..17269cc5e 100644 --- a/flux/flux-examples/pom.xml +++ b/flux/flux-examples/pom.xml @@ -27,8 +27,7 @@ <artifactId>flux-examples</artifactId> <packaging>jar</packaging> - - <name>flux-examples</name> + <name>Storm Flux Examples</name> <dependencies> <dependency> diff --git a/flux/flux-wrappers/pom.xml b/flux/flux-wrappers/pom.xml index caab41b4d..f2b9c5a24 100644 --- a/flux/flux-wrappers/pom.xml +++ b/flux/flux-wrappers/pom.xml @@ -26,9 +26,11 @@ </parent> <artifactId>flux-wrappers</artifactId> + + + <name>Storm Flux Wrappers</name> <packaging>jar</packaging> - <name>flux-wrappers</name> <dependencies> <dependency> diff --git a/flux/pom.xml b/flux/pom.xml index f20ed82c6..51521e224 100644 --- a/flux/pom.xml +++ b/flux/pom.xml @@ -20,7 +20,7 @@ <artifactId>flux</artifactId> <packaging>pom</packaging> - <name>flux</name> + <name>Storm Flux</name> <parent> diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 861f88714..57a3018ea 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -28,7 +28,6 @@ <name>Storm Integration Test</name> <artifactId>storm-integration-test</artifactId> <packaging>jar</packaging> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- see comment below... This fixes an annoyance with intellij --> diff --git a/pom.xml b/pom.xml index 56a863aa3..7072049cb 100644 --- a/pom.xml +++ b/pom.xml @@ -168,9 +168,7 @@ <modules> <module>storm-shaded-deps</module> <module>storm-checkstyle</module> - <module>storm-multilang/javascript</module> - <module>storm-multilang/python</module> - <module>storm-multilang/ruby</module> + <module>storm-multilang</module> <module>storm-buildtools/storm-maven-plugins</module> <module>storm-client</module> <module>storm-server</module> @@ -326,8 +324,7 @@ <profile> <id>dist</id> <modules> - <module>storm-dist/binary</module> - <module>storm-dist/source</module> + <module>storm-dist</module> </modules> <build> <plugins> @@ -451,19 +448,7 @@ <activeByDefault>true</activeByDefault> </activation> <modules> - <module>external/storm-autocreds</module> - <module>external/storm-hdfs</module> - <module>external/storm-hdfs-blobstore</module> - <module>external/storm-hdfs-oci</module> - <module>external/storm-jdbc</module> - <module>external/storm-redis</module> - <module>external/storm-metrics</module> - <module>external/storm-metrics-prometheus</module> - <module>external/storm-kafka-client</module> - <module>external/storm-kafka-migration</module> - <module>external/storm-kafka-monitor</module> - <module>external/storm-jms</module> - <module>external/storm-blobstore-migration</module> + <module>external</module> <module>integration-test</module> <!-- The following modules have dependencies on external modules. --> @@ -476,14 +461,7 @@ <activeByDefault>true</activeByDefault> </activation> <modules> - <module>examples/storm-starter</module> - <module>examples/storm-loadgen</module> - <module>examples/storm-redis-examples</module> - <module>examples/storm-kafka-client-examples</module> - <module>examples/storm-jdbc-examples</module> - <module>examples/storm-hdfs-examples</module> - <module>examples/storm-jms-examples</module> - <module>examples/storm-perf</module> + <module>examples</module> </modules> </profile> </profiles> diff --git a/storm-buildtools/storm-maven-plugins/pom.xml b/storm-buildtools/storm-maven-plugins/pom.xml index 3f2fa8869..eae061e1d 100644 --- a/storm-buildtools/storm-maven-plugins/pom.xml +++ b/storm-buildtools/storm-maven-plugins/pom.xml @@ -26,8 +26,10 @@ </parent> <artifactId>storm-maven-plugins</artifactId> + + + <name>Storm Maven Plugins</name> <packaging>maven-plugin</packaging> - <name>storm-maven-plugins</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/storm-checkstyle/pom.xml b/storm-checkstyle/pom.xml index f7c47019b..422423678 100644 --- a/storm-checkstyle/pom.xml +++ b/storm-checkstyle/pom.xml @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>storm-checkstyle</artifactId> - <name>Apache Storm - Checkstyle</name> + <name>Storm Checkstyle</name> <description>Module to hold Checkstyle properties for Storm.</description> <build> diff --git a/storm-client/pom.xml b/storm-client/pom.xml index b8e7ccf37..8bcdc672b 100644 --- a/storm-client/pom.xml +++ b/storm-client/pom.xml @@ -27,8 +27,10 @@ </parent> <artifactId>storm-client</artifactId> - <packaging>jar</packaging> + + <name>Storm Client</name> + <packaging>jar</packaging> <description>The client side (including worker) of Storm implementations.</description> <dependencies> diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 860c19a58..182943934 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -25,8 +25,10 @@ </parent> <artifactId>storm-core</artifactId> - <packaging>jar</packaging> + + <name>Storm Core</name> + <packaging>jar</packaging> <description>Storm Core Java API and Clojure implementation.</description> <properties> diff --git a/storm-dist/binary/final-package/pom.xml b/storm-dist/binary/final-package/pom.xml index c62870378..8471b307c 100644 --- a/storm-dist/binary/final-package/pom.xml +++ b/storm-dist/binary/final-package/pom.xml @@ -26,8 +26,10 @@ </parent> <artifactId>final-package</artifactId> + + + <name>Storm Binary Distribution Final Package</name> <packaging>pom</packaging> - <name>Storm Binary Distribution (Final Package)</name> <description>Storm binary distribution</description> <dependencies> diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml index 54e7a586b..94209592e 100644 --- a/storm-dist/binary/pom.xml +++ b/storm-dist/binary/pom.xml @@ -19,15 +19,17 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-dist</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>apache-storm-bin</artifactId> - <packaging>pom</packaging> + + <name>Storm Binary Distribution</name> + <packaging>pom</packaging> <description>Storm binary distribution</description> <!-- diff --git a/storm-dist/binary/storm-autocreds-bin/pom.xml b/storm-dist/binary/storm-autocreds-bin/pom.xml index a0156c2bf..8b42b902f 100644 --- a/storm-dist/binary/storm-autocreds-bin/pom.xml +++ b/storm-dist/binary/storm-autocreds-bin/pom.xml @@ -25,6 +25,8 @@ <artifactId>storm-autocreds-bin</artifactId> <packaging>pom</packaging> + + <name>Storm Autocreds Binary</name> <dependencies> <dependency> <groupId>org.apache.storm</groupId> diff --git a/storm-dist/binary/storm-client-bin/pom.xml b/storm-dist/binary/storm-client-bin/pom.xml index 20cf8bc82..8266781b3 100644 --- a/storm-dist/binary/storm-client-bin/pom.xml +++ b/storm-dist/binary/storm-client-bin/pom.xml @@ -27,6 +27,9 @@ </parent> <artifactId>storm-client-bin</artifactId> + + + <name>Storm Client Binary</name> <packaging>pom</packaging> <dependencies> diff --git a/storm-dist/binary/storm-kafka-monitor-bin/pom.xml b/storm-dist/binary/storm-kafka-monitor-bin/pom.xml index 7a411aada..4d9e569a9 100644 --- a/storm-dist/binary/storm-kafka-monitor-bin/pom.xml +++ b/storm-dist/binary/storm-kafka-monitor-bin/pom.xml @@ -25,6 +25,8 @@ <artifactId>storm-kafka-monitor-bin</artifactId> <packaging>pom</packaging> + + <name>Storm Kafka Monitor Binary</name> <dependencies> <dependency> <groupId>org.apache.storm</groupId> diff --git a/storm-dist/binary/storm-submit-tools-bin/pom.xml b/storm-dist/binary/storm-submit-tools-bin/pom.xml index 531e8da0b..ea7ee9a81 100644 --- a/storm-dist/binary/storm-submit-tools-bin/pom.xml +++ b/storm-dist/binary/storm-submit-tools-bin/pom.xml @@ -25,6 +25,8 @@ <artifactId>storm-submit-tools-bin</artifactId> <packaging>pom</packaging> + + <name>Storm Submit Tools Binary</name> <dependencies> <dependency> <groupId>org.apache.storm</groupId> diff --git a/storm-dist/binary/storm-webapp-bin/pom.xml b/storm-dist/binary/storm-webapp-bin/pom.xml index 2c1f776a2..a8a7ed36f 100644 --- a/storm-dist/binary/storm-webapp-bin/pom.xml +++ b/storm-dist/binary/storm-webapp-bin/pom.xml @@ -26,6 +26,9 @@ </parent> <artifactId>storm-webapp-bin</artifactId> + + + <name>Storm Webapp Binary</name> <packaging>pom</packaging> <dependencies> diff --git a/storm-multilang/ruby/pom.xml b/storm-dist/pom.xml similarity index 68% copy from storm-multilang/ruby/pom.xml copy to storm-dist/pom.xml index d4569c8cd..65a60a330 100644 --- a/storm-multilang/ruby/pom.xml +++ b/storm-dist/pom.xml @@ -15,30 +15,22 @@ See the License for the specific language governing permissions and limitations under the License. --> - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> <artifactId>storm</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> - <artifactId>multilang-ruby</artifactId> - <packaging>jar</packaging> - <name>multilang-ruby</name> + <artifactId>storm-dist</artifactId> + <packaging>pom</packaging> + <name>Storm Distribution</name> + <description>Aggregator for Storm binary and source distributions.</description> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + <modules> + <module>binary</module> + <module>source</module> + </modules> </project> diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml index 17eb6e59b..2296c59bf 100644 --- a/storm-dist/source/pom.xml +++ b/storm-dist/source/pom.xml @@ -19,15 +19,17 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-dist</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>apache-storm-source</artifactId> - <packaging>pom</packaging> + + <name>Storm Source Distribution</name> + <packaging>pom</packaging> <description>Storm source distribution</description> <dependencies> diff --git a/storm-multilang/javascript/pom.xml b/storm-multilang/javascript/pom.xml index 18deb8cd1..4e69a4b6e 100644 --- a/storm-multilang/javascript/pom.xml +++ b/storm-multilang/javascript/pom.xml @@ -19,15 +19,17 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-multilang</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>multilang-javascript</artifactId> + + + <name>Storm Multilang JavaScript</name> <packaging>jar</packaging> - <name>multilang-javascript</name> <build> <plugins> diff --git a/storm-multilang/ruby/pom.xml b/storm-multilang/pom.xml similarity index 68% copy from storm-multilang/ruby/pom.xml copy to storm-multilang/pom.xml index d4569c8cd..23542b526 100644 --- a/storm-multilang/ruby/pom.xml +++ b/storm-multilang/pom.xml @@ -15,30 +15,23 @@ See the License for the specific language governing permissions and limitations under the License. --> - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> <artifactId>storm</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> - <artifactId>multilang-ruby</artifactId> - <packaging>jar</packaging> - <name>multilang-ruby</name> + <artifactId>storm-multilang</artifactId> + <packaging>pom</packaging> + <name>Storm Multilang</name> + <description>Aggregator for Storm multi-language adapter resources.</description> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> + <modules> + <module>javascript</module> + <module>python</module> + <module>ruby</module> + </modules> </project> diff --git a/storm-multilang/python/pom.xml b/storm-multilang/python/pom.xml index 2324e84d8..766692f51 100644 --- a/storm-multilang/python/pom.xml +++ b/storm-multilang/python/pom.xml @@ -19,15 +19,17 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-multilang</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>multilang-python</artifactId> + + + <name>Storm Multilang Python</name> <packaging>jar</packaging> - <name>multilang-python</name> <build> <plugins> diff --git a/storm-multilang/ruby/pom.xml b/storm-multilang/ruby/pom.xml index d4569c8cd..5391f41d6 100644 --- a/storm-multilang/ruby/pom.xml +++ b/storm-multilang/ruby/pom.xml @@ -19,15 +19,17 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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> <parent> - <artifactId>storm</artifactId> + <artifactId>storm-multilang</artifactId> <groupId>org.apache.storm</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>multilang-ruby</artifactId> + + + <name>Storm Multilang Ruby</name> <packaging>jar</packaging> - <name>multilang-ruby</name> <build> <plugins> diff --git a/storm-server/pom.xml b/storm-server/pom.xml index 2d95a7592..2f7b10a2a 100644 --- a/storm-server/pom.xml +++ b/storm-server/pom.xml @@ -28,6 +28,8 @@ <artifactId>storm-server</artifactId> + + <name>Storm Server</name> <properties> <storm-server.test.introspection.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</storm-server.test.introspection.argLine> </properties> diff --git a/storm-shaded-deps/pom.xml b/storm-shaded-deps/pom.xml index 3ba808cef..2a375e302 100644 --- a/storm-shaded-deps/pom.xml +++ b/storm-shaded-deps/pom.xml @@ -28,8 +28,10 @@ </parent> <artifactId>storm-shaded-deps</artifactId> + + + <name>Storm Shaded Deps</name> <packaging>jar</packaging> - <name>Shaded Deps for Storm Client</name> <description>Shaded version of dependencies used only for internal storm code.</description> <dependencies> diff --git a/storm-submit-tools/pom.xml b/storm-submit-tools/pom.xml index c09f9b24b..8b7bbabab 100644 --- a/storm-submit-tools/pom.xml +++ b/storm-submit-tools/pom.xml @@ -24,6 +24,8 @@ <artifactId>storm-submit-tools</artifactId> + + <name>Storm Submit Tools</name> <dependencies> <dependency> <groupId>org.apache.commons</groupId> diff --git a/storm-webapp/pom.xml b/storm-webapp/pom.xml index 615a53c86..9a7c9434c 100644 --- a/storm-webapp/pom.xml +++ b/storm-webapp/pom.xml @@ -26,8 +26,10 @@ </parent> <artifactId>storm-webapp</artifactId> - <packaging>jar</packaging> + + <name>Storm Webapp</name> + <packaging>jar</packaging> <description>Webapp Servers for Apache Storm</description> <properties>
