This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/flume.git
The following commit(s) were added to refs/heads/trunk by this push: new bfbfcbb1 FLUME-3427 - Add automatic module names bfbfcbb1 is described below commit bfbfcbb17aa541e15c943939160f2ec99a7213b9 Author: Ralph Goers <rgo...@apache.org> AuthorDate: Mon Jul 11 16:23:53 2022 -0700 FLUME-3427 - Add automatic module names --- build-support/pom.xml | 2 +- flume-ng-auth/pom.xml | 3 +- flume-ng-channels/flume-file-channel/pom.xml | 3 +- flume-ng-channels/flume-jdbc-channel/pom.xml | 3 +- flume-ng-channels/flume-kafka-channel/pom.xml | 3 +- .../flume-spillable-memory-channel/pom.xml | 3 +- flume-ng-channels/pom.xml | 2 +- flume-ng-clients/flume-ng-log4jappender/pom.xml | 3 +- flume-ng-clients/pom.xml | 2 +- .../flume-ng-config-filter-api/pom.xml | 6 +++- .../pom.xml | 6 +++- .../pom.xml | 6 +++- .../pom.xml | 6 +++- flume-ng-configfilters/pom.xml | 2 +- flume-ng-configuration/pom.xml | 3 +- flume-ng-core/pom.xml | 3 +- flume-ng-dist/pom.xml | 2 +- flume-ng-embedded-agent/pom.xml | 3 +- flume-ng-legacy-sources/flume-avro-source/pom.xml | 3 +- .../flume-thrift-source/pom.xml | 3 +- flume-ng-legacy-sources/pom.xml | 2 +- flume-ng-node/pom.xml | 3 +- flume-ng-sdk/pom.xml | 3 +- flume-ng-sinks/flume-hdfs-sink/pom.xml | 3 +- flume-ng-sinks/flume-hive-sink/pom.xml | 3 +- flume-ng-sinks/flume-http-sink/pom.xml | 3 +- flume-ng-sinks/flume-irc-sink/pom.xml | 3 +- flume-ng-sinks/flume-ng-hbase-sink/pom.xml | 3 +- flume-ng-sinks/flume-ng-hbase2-sink/pom.xml | 3 +- flume-ng-sinks/flume-ng-kafka-sink/pom.xml | 3 +- flume-ng-sinks/flume-ng-kudu-sink/pom.xml | 3 +- .../flume-ng-morphline-solr-sink/pom.xml | 3 +- flume-ng-sinks/pom.xml | 2 +- flume-ng-sources/flume-jms-source/pom.xml | 3 +- flume-ng-sources/flume-kafka-source/pom.xml | 3 +- flume-ng-sources/flume-scribe-source/pom.xml | 3 +- flume-ng-sources/flume-taildir-source/pom.xml | 3 +- flume-ng-sources/flume-twitter-source/pom.xml | 3 +- flume-ng-sources/pom.xml | 2 +- flume-ng-tests/pom.xml | 6 +++- flume-shared/flume-shared-kafka-test/pom.xml | 3 +- flume-shared/flume-shared-kafka/pom.xml | 6 +++- flume-shared/pom.xml | 2 +- flume-tools/pom.xml | 3 +- pom.xml | 36 ++++++++++++++++++++-- 45 files changed, 131 insertions(+), 46 deletions(-) diff --git a/build-support/pom.xml b/build-support/pom.xml index b1479521..4016fa38 100644 --- a/build-support/pom.xml +++ b/build-support/pom.xml @@ -22,7 +22,7 @@ limitations under the License. <groupId>org.apache.flume</groupId> <artifactId>build-support</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> <name>Build Support</name> <description>Build tools and Configuration</description> <properties> diff --git a/flume-ng-auth/pom.xml b/flume-ng-auth/pom.xml index 15e40c84..48a638b3 100644 --- a/flume-ng-auth/pom.xml +++ b/flume-ng-auth/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <artifactId>flume-ng-auth</artifactId> @@ -32,6 +32,7 @@ limitations under the License. <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>1</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>7</pmd.maxAllowedViolations> + <module.name>org.apache.flume.auth</module.name> </properties> <dependencies> diff --git a/flume-ng-channels/flume-file-channel/pom.xml b/flume-ng-channels/flume-file-channel/pom.xml index bc0617d8..e0afb5ca 100644 --- a/flume-ng-channels/flume-file-channel/pom.xml +++ b/flume-ng-channels/flume-file-channel/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>flume-ng-channels</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-channels</groupId> @@ -35,6 +35,7 @@ <!-- TODO fix spotbugs violations --> <spotbugs.maxAllowedViolations>86</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>544</pmd.maxAllowedViolations> + <module.name>org.apache.flume.channel.file</module.name> </properties> <dependencies> diff --git a/flume-ng-channels/flume-jdbc-channel/pom.xml b/flume-ng-channels/flume-jdbc-channel/pom.xml index e33f965f..f622e1bc 100644 --- a/flume-ng-channels/flume-jdbc-channel/pom.xml +++ b/flume-ng-channels/flume-jdbc-channel/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-ng-channels</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-channels</groupId> @@ -34,6 +34,7 @@ limitations under the License. <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>31</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>16</pmd.maxAllowedViolations> + <module.name>org.apache.flume.channel.jdbc</module.name> </properties> <dependencies> diff --git a/flume-ng-channels/flume-kafka-channel/pom.xml b/flume-ng-channels/flume-kafka-channel/pom.xml index 1c5b318e..57600514 100644 --- a/flume-ng-channels/flume-kafka-channel/pom.xml +++ b/flume-ng-channels/flume-kafka-channel/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <artifactId>flume-ng-channels</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -32,6 +32,7 @@ limitations under the License. <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>13</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>13</pmd.maxAllowedViolations> + <module.name>org.apache.flume.channel.kafka</module.name> </properties> <dependencies> diff --git a/flume-ng-channels/flume-spillable-memory-channel/pom.xml b/flume-ng-channels/flume-spillable-memory-channel/pom.xml index a05ec3bb..69344629 100644 --- a/flume-ng-channels/flume-spillable-memory-channel/pom.xml +++ b/flume-ng-channels/flume-spillable-memory-channel/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>flume-ng-channels</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-channels</groupId> @@ -35,6 +35,7 @@ <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>2</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>8</pmd.maxAllowedViolations> + <module.name>org.apache.flume.channel.spillable.memory</module.name> </properties> <dependencies> diff --git a/flume-ng-channels/pom.xml b/flume-ng-channels/pom.xml index 10d98312..7ca00d0b 100644 --- a/flume-ng-channels/pom.xml +++ b/flume-ng-channels/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <artifactId>flume-ng-channels</artifactId> diff --git a/flume-ng-clients/flume-ng-log4jappender/pom.xml b/flume-ng-clients/flume-ng-log4jappender/pom.xml index 797a00f2..e8fb40a0 100644 --- a/flume-ng-clients/flume-ng-log4jappender/pom.xml +++ b/flume-ng-clients/flume-ng-log4jappender/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <artifactId>flume-ng-clients</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -33,6 +33,7 @@ limitations under the License. <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>2</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>1</pmd.maxAllowedViolations> + <module.name>org.apache.flume.clients.log4jappender</module.name> </properties> <build> diff --git a/flume-ng-clients/pom.xml b/flume-ng-clients/pom.xml index 735d5279..98b7eeb0 100644 --- a/flume-ng-clients/pom.xml +++ b/flume-ng-clients/pom.xml @@ -20,7 +20,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>flume-ng-clients</artifactId> diff --git a/flume-ng-configfilters/flume-ng-config-filter-api/pom.xml b/flume-ng-configfilters/flume-ng-config-filter-api/pom.xml index e530c36d..b590d26b 100644 --- a/flume-ng-configfilters/flume-ng-config-filter-api/pom.xml +++ b/flume-ng-configfilters/flume-ng-config-filter-api/pom.xml @@ -20,10 +20,14 @@ limitations under the License. <parent> <artifactId>flume-ng-configfilters</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> + <properties> + <module.name>org.apache.flume.configfilter.api</module.name> + </properties> + <artifactId>flume-ng-config-filter-api</artifactId> <name>Flume NG Config Filters API</name> diff --git a/flume-ng-configfilters/flume-ng-environment-variable-config-filter/pom.xml b/flume-ng-configfilters/flume-ng-environment-variable-config-filter/pom.xml index 2800a458..166660f5 100644 --- a/flume-ng-configfilters/flume-ng-environment-variable-config-filter/pom.xml +++ b/flume-ng-configfilters/flume-ng-environment-variable-config-filter/pom.xml @@ -20,10 +20,14 @@ limitations under the License. <parent> <artifactId>flume-ng-configfilters</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> + <properties> + <module.name>org.apache.flume.configfilter.env</module.name> + </properties> + <artifactId>flume-ng-environment-variable-config-filter</artifactId> <name>Flume NG Environment Variable Config Filter</name> diff --git a/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml b/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml index 22893f65..c925a308 100644 --- a/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml +++ b/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml @@ -21,10 +21,14 @@ limitations under the License. <parent> <artifactId>flume-ng-configfilters</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> + <properties> + <module.name>org.apache.flume.configfilter.external</module.name> + </properties> + <artifactId>flume-ng-external-process-config-filter</artifactId> <name>Flume NG External Process Config Filter</name> diff --git a/flume-ng-configfilters/flume-ng-hadoop-credential-store-config-filter/pom.xml b/flume-ng-configfilters/flume-ng-hadoop-credential-store-config-filter/pom.xml index a7a66e14..9882eeea 100644 --- a/flume-ng-configfilters/flume-ng-hadoop-credential-store-config-filter/pom.xml +++ b/flume-ng-configfilters/flume-ng-hadoop-credential-store-config-filter/pom.xml @@ -20,10 +20,14 @@ limitations under the License. <parent> <artifactId>flume-ng-configfilters</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> + <properties> + <module.name>org.apache.flume.configfilter.credstore</module.name> + </properties> + <artifactId>flume-ng-hadoop-credential-store-config-filter</artifactId> <dependencies> <dependency> diff --git a/flume-ng-configfilters/pom.xml b/flume-ng-configfilters/pom.xml index 9cc2654f..24321349 100644 --- a/flume-ng-configfilters/pom.xml +++ b/flume-ng-configfilters/pom.xml @@ -20,7 +20,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/flume-ng-configuration/pom.xml b/flume-ng-configuration/pom.xml index 5f23c82d..3bf7f11c 100644 --- a/flume-ng-configuration/pom.xml +++ b/flume-ng-configuration/pom.xml @@ -20,7 +20,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>flume-ng-configuration</artifactId> @@ -30,6 +30,7 @@ limitations under the License. <!-- TODO fix spotbugs violations --> <spotbugs.maxAllowedViolations>8</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>17</pmd.maxAllowedViolations> + <module.name>org.apache.flume.conf</module.name> </properties> <dependencies> diff --git a/flume-ng-core/pom.xml b/flume-ng-core/pom.xml index b1db98cd..a106b9ff 100644 --- a/flume-ng-core/pom.xml +++ b/flume-ng-core/pom.xml @@ -22,7 +22,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume</groupId> @@ -33,6 +33,7 @@ limitations under the License. <!-- TODO fix spotbugs violations --> <spotbugs.maxAllowedViolations>115</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>121</pmd.maxAllowedViolations> + <module.name>org.apache.flume.core</module.name> </properties> <build> diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml index 5bbfd34e..b6ebffbf 100644 --- a/flume-ng-dist/pom.xml +++ b/flume-ng-dist/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <artifactId>flume-ng-dist</artifactId> diff --git a/flume-ng-embedded-agent/pom.xml b/flume-ng-embedded-agent/pom.xml index bcb2989b..2cad572c 100644 --- a/flume-ng-embedded-agent/pom.xml +++ b/flume-ng-embedded-agent/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <artifactId>flume-ng-embedded-agent</artifactId> @@ -31,6 +31,7 @@ limitations under the License. <properties> <!-- TODO fix pmd violations --> <pmd.maxAllowedViolations>2</pmd.maxAllowedViolations> + <module.name>org.apache.flume.agent.embedded</module.name> </properties> <dependencies> diff --git a/flume-ng-legacy-sources/flume-avro-source/pom.xml b/flume-ng-legacy-sources/flume-avro-source/pom.xml index ca2f78ca..2928a025 100644 --- a/flume-ng-legacy-sources/flume-avro-source/pom.xml +++ b/flume-ng-legacy-sources/flume-avro-source/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-ng-legacy-sources</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-legacy-sources</groupId> @@ -35,6 +35,7 @@ limitations under the License. <spotbugs.maxAllowedViolations>5</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>37</pmd.maxAllowedViolations> <thrift.executable>${env.THRIFT_HOME}/bin/thrift</thrift.executable> + <module.name>org.apache.flume.source.avroLegacy</module.name> </properties> <build> diff --git a/flume-ng-legacy-sources/flume-thrift-source/pom.xml b/flume-ng-legacy-sources/flume-thrift-source/pom.xml index 71e17c07..93e4b6f0 100644 --- a/flume-ng-legacy-sources/flume-thrift-source/pom.xml +++ b/flume-ng-legacy-sources/flume-thrift-source/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-ng-legacy-sources</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-legacy-sources</groupId> @@ -39,6 +39,7 @@ limitations under the License. the remaining violations and we must live with them. --> <pmd.maxAllowedViolations>91</pmd.maxAllowedViolations> <pmd.excludeFromFailureFile>${basedir}/exclude-pmd.properties</pmd.excludeFromFailureFile> + <module.name>org.apache.flume.source.thriftLegacy</module.name> </properties> <profiles> diff --git a/flume-ng-legacy-sources/pom.xml b/flume-ng-legacy-sources/pom.xml index 9727e102..7e4ed22f 100644 --- a/flume-ng-legacy-sources/pom.xml +++ b/flume-ng-legacy-sources/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <artifactId>flume-ng-legacy-sources</artifactId> diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml index 9941704a..df3cd4d7 100644 --- a/flume-ng-node/pom.xml +++ b/flume-ng-node/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <artifactId>flume-ng-node</artifactId> @@ -35,6 +35,7 @@ <!-- TODO fix spotbugs violations --> <spotbugs.maxAllowedViolations>7</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>7</pmd.maxAllowedViolations> + <module.name>org.apache.flume.node</module.name> </properties> <dependencies> diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml index 135975b6..234d9319 100644 --- a/flume-ng-sdk/pom.xml +++ b/flume-ng-sdk/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <artifactId>flume-ng-sdk</artifactId> @@ -32,6 +32,7 @@ limitations under the License. <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>69</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>170</pmd.maxAllowedViolations> + <module.name>org.apache.flume.sdk</module.name> </properties> <profiles> diff --git a/flume-ng-sinks/flume-hdfs-sink/pom.xml b/flume-ng-sinks/flume-hdfs-sink/pom.xml index 3450609a..d2d6bed4 100644 --- a/flume-ng-sinks/flume-hdfs-sink/pom.xml +++ b/flume-ng-sinks/flume-hdfs-sink/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-ng-sinks</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sinks</groupId> @@ -34,6 +34,7 @@ limitations under the License. <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>14</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>25</pmd.maxAllowedViolations> + <module.name>org.apache.flume.sink.hdfs</module.name> </properties> <dependencies> diff --git a/flume-ng-sinks/flume-hive-sink/pom.xml b/flume-ng-sinks/flume-hive-sink/pom.xml index 2320cfac..52ab009c 100644 --- a/flume-ng-sinks/flume-hive-sink/pom.xml +++ b/flume-ng-sinks/flume-hive-sink/pom.xml @@ -23,13 +23,14 @@ limitations under the License. <parent> <groupId>org.apache.flume</groupId> <artifactId>flume-ng-sinks</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <properties> <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>6</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>7</pmd.maxAllowedViolations> + <module.name>org.apache.flume.sink.hive</module.name> </properties> <groupId>org.apache.flume.flume-ng-sinks</groupId> diff --git a/flume-ng-sinks/flume-http-sink/pom.xml b/flume-ng-sinks/flume-http-sink/pom.xml index 5f6b98aa..c40ede0c 100644 --- a/flume-ng-sinks/flume-http-sink/pom.xml +++ b/flume-ng-sinks/flume-http-sink/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-ng-sinks</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sinks</groupId> @@ -34,6 +34,7 @@ limitations under the License. <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>1</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>1</pmd.maxAllowedViolations> + <module.name>org.apache.flume.sink.http</module.name> </properties> <dependencies> diff --git a/flume-ng-sinks/flume-irc-sink/pom.xml b/flume-ng-sinks/flume-irc-sink/pom.xml index 6020983b..64ab966a 100644 --- a/flume-ng-sinks/flume-irc-sink/pom.xml +++ b/flume-ng-sinks/flume-irc-sink/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-ng-sinks</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sinks</groupId> @@ -33,6 +33,7 @@ limitations under the License. <properties> <!-- TODO fix spotbugs violations --> <spotbugs.maxAllowedViolations>1</spotbugs.maxAllowedViolations> + <module.name>org.apache.flume.sink.irc</module.name> </properties> <dependencies> diff --git a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml index c8cd0924..cdf42c9c 100644 --- a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>flume-ng-sinks</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sinks</groupId> <artifactId>flume-ng-hbase-sink</artifactId> @@ -25,6 +25,7 @@ <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>24</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>16</pmd.maxAllowedViolations> + <module.name>org.apache.flume.sink.hbase</module.name> </properties> <dependencies> diff --git a/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml index de847e2a..c945205a 100644 --- a/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml @@ -15,7 +15,7 @@ <parent> <artifactId>flume-ng-sinks</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sinks</groupId> <artifactId>flume-ng-hbase2-sink</artifactId> @@ -24,6 +24,7 @@ <properties> <!-- TODO fix spotbugs violations --> <spotbugs.maxAllowedViolations>3</spotbugs.maxAllowedViolations> + <module.name>org.apache.flume.sink.hbase2</module.name> </properties> <dependencyManagement> diff --git a/flume-ng-sinks/flume-ng-kafka-sink/pom.xml b/flume-ng-sinks/flume-ng-kafka-sink/pom.xml index fe0a7e61..6ae67bd9 100644 --- a/flume-ng-sinks/flume-ng-kafka-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-kafka-sink/pom.xml @@ -16,7 +16,7 @@ <parent> <artifactId>flume-ng-sinks</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sinks</groupId> <artifactId>flume-ng-kafka-sink</artifactId> @@ -26,6 +26,7 @@ <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>3</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>3</pmd.maxAllowedViolations> + <module.name>org.apache.flume.sink.kafka</module.name> </properties> <build> diff --git a/flume-ng-sinks/flume-ng-kudu-sink/pom.xml b/flume-ng-sinks/flume-ng-kudu-sink/pom.xml index d0adaffa..48dac760 100644 --- a/flume-ng-sinks/flume-ng-kudu-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-kudu-sink/pom.xml @@ -16,7 +16,7 @@ <parent> <artifactId>flume-ng-sinks</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sinks</groupId> <artifactId>flume-ng-kudu-sink</artifactId> @@ -24,6 +24,7 @@ <properties> <exclude.tests>None</exclude.tests> + <module.name>org.apache.flume.sink.kudu</module.name> </properties> <build> diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml index 4277fa98..9cadafe7 100644 --- a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <artifactId>flume-ng-sinks</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sinks</groupId> @@ -35,6 +35,7 @@ limitations under the License. <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <solr.version>${solr-global.version}</solr.version> <solr.expected.version>${solr-global.version}</solr.expected.version> <!-- sanity check to verify we actually run against the expected version rather than some outdated version --> + <module.name>org.apache.flume.sink.solr.morphline</module.name> </properties> <repositories> diff --git a/flume-ng-sinks/pom.xml b/flume-ng-sinks/pom.xml index 2fd67cdc..19c671c1 100644 --- a/flume-ng-sinks/pom.xml +++ b/flume-ng-sinks/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <artifactId>flume-ng-sinks</artifactId> diff --git a/flume-ng-sources/flume-jms-source/pom.xml b/flume-ng-sources/flume-jms-source/pom.xml index b0599895..ac4ceb98 100644 --- a/flume-ng-sources/flume-jms-source/pom.xml +++ b/flume-ng-sources/flume-jms-source/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-ng-sources</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sources</groupId> @@ -34,6 +34,7 @@ limitations under the License. <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>5</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>4</pmd.maxAllowedViolations> + <module.name>org.apache.flume.source.jms</module.name> </properties> <dependencies> diff --git a/flume-ng-sources/flume-kafka-source/pom.xml b/flume-ng-sources/flume-kafka-source/pom.xml index 5a4eb2d5..d90a698b 100644 --- a/flume-ng-sources/flume-kafka-source/pom.xml +++ b/flume-ng-sources/flume-kafka-source/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>flume-ng-sources</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -34,6 +34,7 @@ <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>16</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>32</pmd.maxAllowedViolations> + <module.name>org.apache.flume.source.kafka</module.name> </properties> <dependencies> diff --git a/flume-ng-sources/flume-scribe-source/pom.xml b/flume-ng-sources/flume-scribe-source/pom.xml index 3bc80c8e..e3e207bd 100644 --- a/flume-ng-sources/flume-scribe-source/pom.xml +++ b/flume-ng-sources/flume-scribe-source/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-ng-sources</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sources</groupId> @@ -34,6 +34,7 @@ limitations under the License. <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>19</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>76</pmd.maxAllowedViolations> + <module.name>org.apache.flume.source.scribe</module.name> </properties> <profiles> diff --git a/flume-ng-sources/flume-taildir-source/pom.xml b/flume-ng-sources/flume-taildir-source/pom.xml index 748c787c..47a31854 100644 --- a/flume-ng-sources/flume-taildir-source/pom.xml +++ b/flume-ng-sources/flume-taildir-source/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-ng-sources</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sources</groupId> @@ -34,6 +34,7 @@ limitations under the License. <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>14</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>3</pmd.maxAllowedViolations> + <module.name>org.apache.flume.source.taildir</module.name> </properties> <dependencies> diff --git a/flume-ng-sources/flume-twitter-source/pom.xml b/flume-ng-sources/flume-twitter-source/pom.xml index 218520f4..6d728ded 100644 --- a/flume-ng-sources/flume-twitter-source/pom.xml +++ b/flume-ng-sources/flume-twitter-source/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-ng-sources</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-ng-sources</groupId> @@ -34,6 +34,7 @@ limitations under the License. <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>4</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>2</pmd.maxAllowedViolations> + <module.name>org.apache.flume.source.twitter</module.name> </properties> <dependencies> diff --git a/flume-ng-sources/pom.xml b/flume-ng-sources/pom.xml index 4ddbaa88..f13e88f3 100644 --- a/flume-ng-sources/pom.xml +++ b/flume-ng-sources/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume</groupId> diff --git a/flume-ng-tests/pom.xml b/flume-ng-tests/pom.xml index d7b6a020..96a8f51d 100644 --- a/flume-ng-tests/pom.xml +++ b/flume-ng-tests/pom.xml @@ -24,13 +24,17 @@ <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <artifactId>flume-ng-tests</artifactId> <packaging>jar</packaging> <name>Flume NG Integration Tests</name> + <properties> + <module.name>org.apache.flume.tests</module.name> + </properties> + <dependencies> <dependency> <groupId>org.apache.flume</groupId> diff --git a/flume-shared/flume-shared-kafka-test/pom.xml b/flume-shared/flume-shared-kafka-test/pom.xml index 328efb61..bd3d9ee4 100644 --- a/flume-shared/flume-shared-kafka-test/pom.xml +++ b/flume-shared/flume-shared-kafka-test/pom.xml @@ -16,7 +16,7 @@ <parent> <artifactId>flume-shared</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-shared</groupId> <artifactId>flume-shared-kafka-test</artifactId> @@ -26,6 +26,7 @@ <!-- TODO fix spotbugs/pmd violations --> <spotbugs.maxAllowedViolations>1</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>1</pmd.maxAllowedViolations> + <module.name>org.apache.flume.shared.kafka.test</module.name> </properties> <build> diff --git a/flume-shared/flume-shared-kafka/pom.xml b/flume-shared/flume-shared-kafka/pom.xml index a2c06968..cedaa594 100644 --- a/flume-shared/flume-shared-kafka/pom.xml +++ b/flume-shared/flume-shared-kafka/pom.xml @@ -24,13 +24,17 @@ limitations under the License. <parent> <artifactId>flume-shared</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume.flume-shared</groupId> <artifactId>flume-shared-kafka</artifactId> <name>Flume Shared Kafka</name> + <properties> + <module.name>org.apache.flume.shared.kafka</module.name> + </properties> + <dependencies> <dependency> <groupId>org.apache.flume</groupId> diff --git a/flume-shared/pom.xml b/flume-shared/pom.xml index 673824a1..96f383d4 100644 --- a/flume-shared/pom.xml +++ b/flume-shared/pom.xml @@ -23,7 +23,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume</groupId> diff --git a/flume-tools/pom.xml b/flume-tools/pom.xml index ce860d17..fdd152f0 100644 --- a/flume-tools/pom.xml +++ b/flume-tools/pom.xml @@ -25,7 +25,7 @@ limitations under the License. <parent> <artifactId>flume-parent</artifactId> <groupId>org.apache.flume</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> </parent> <groupId>org.apache.flume</groupId> @@ -38,6 +38,7 @@ limitations under the License. <spotbugs.maxAllowedViolations>5</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>2</pmd.maxAllowedViolations> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <module.name>org.apache.flume.tools</module.name> </properties> <dependencies> diff --git a/pom.xml b/pom.xml index a063ec77..c13aced9 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <groupId>org.apache.flume</groupId> <artifactId>flume-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>1.10.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Flume</name> @@ -89,10 +89,11 @@ limitations under the License. <kite.version>1.1.0</kite.version> <kudu.version>1.10.0</kudu.version> <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version> - <log4j.version>2.17.1</log4j.version> + <log4j.version>2.18.0</log4j.version> <mapdb.version>0.9.9</mapdb.version> <mina.version>2.1.5</mina.version> <mockito.version>1.9.0</mockito.version> + <module.name /> <mvn-antrun-plugin.version>1.8</mvn-antrun-plugin.version> <mvn-assembly-plugin.version>3.1.0</mvn-assembly-plugin.version> <mvn-build-helper-plugin>3.0.0</mvn-build-helper-plugin> @@ -102,6 +103,7 @@ limitations under the License. <mvn-compiler-plugin.version>3.8.1</mvn-compiler-plugin.version> <mvn-deploy-plugin.version>2.8.2</mvn-deploy-plugin.version> <mvn-gpg-plugin.version>1.6</mvn-gpg-plugin.version> + <mvn-jar-plugin.version>3.1.0</mvn-jar-plugin.version> <mvn-javadoc-plugin.version>2.9</mvn-javadoc-plugin.version> <mvn-paranamer-plugin.version>2.8</mvn-paranamer-plugin.version> <mvn-pmd-plugin.version>3.15.0</mvn-pmd-plugin.version> @@ -495,6 +497,36 @@ limitations under the License. </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${mvn-jar-plugin.version}</version> + <executions> + <execution> + <id>default-jar</id> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <archive> + <manifestEntries> + <Specification-Title>${project.name}</Specification-Title> + <Specification-Version>${project.version}</Specification-Version> + <Specification-Vendor>${project.organization.name}</Specification-Vendor> + <Implementation-Title>${project.name}</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> + <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> + <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> + <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> + <Automatic-Module-Name>${module.name}</Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId>