Remove the hadoop components

apache · May 12, 2024 · 3e09848 · 3e09848 · ppkarwasz · Oct 4, 2024
1 parent b2e67f4
commit 3e09848
Show file tree

Hide file tree

Showing 85 changed files with 17 additions and 15,398 deletions.
diff --git a/flume-bom/pom.xml b/flume-bom/pom.xml
@@ -32,7 +32,7 @@ limitations under the License.
   <name>Apache Flume Artifacts</name>
 
   <properties>
-    <flume-hadoop.version>1.11.1-SNAPSHOT</flume-hadoop.version>
+    <flume-hadoop.version>2.0.0-SNAPSHOT</flume-hadoop.version>
     <flume-http.version>1.11.1-SNAPSHOT</flume-http.version>
     <flume-irc.version>1.11.1-SNAPSHOT</flume-irc.version>
     <flume-jdbc.version>2.0.0-SNAPSHOT</flume-jdbc.version>
@@ -92,8 +92,8 @@ limitations under the License.
       </dependency>
       <dependency>
         <groupId>org.apache.flume</groupId>
-        <artifactId>flume-ng-hadoop-credential-store-config-filter</artifactId>
-        <version>${project.version}</version>
+        <artifactId>flume-hadoop-credential-store-config-filter</artifactId>
+        <version>${flume-hadoop.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.flume</groupId>
@@ -172,12 +172,12 @@ limitations under the License.
         <version>${morphline.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.flume.flume-ng-sinks</groupId>
+        <groupId>org.apache.flume</groupId>
         <artifactId>flume-hdfs-sink</artifactId>
         <version>${flume-hadoop.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.flume.flume-ng-sinks</groupId>
+        <groupId>org.apache.flume</groupId>
         <artifactId>flume-hive-sink</artifactId>
         <version>${flume-hadoop.version}</version>
       </dependency>
@@ -192,8 +192,8 @@ limitations under the License.
         <version>${flume-irc.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.flume.flume-ng-sinks</groupId>
-        <artifactId>flume-ng-hbase2-sink</artifactId>
+        <groupId>org.apache.flume</groupId>
+        <artifactId>flume-hbase2-sink</artifactId>
         <version>${flume-hadoop.version}</version>
       </dependency>
       <dependency>
@@ -202,8 +202,8 @@ limitations under the License.
         <version>${flume-kafka.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.flume.flume-ng-sinks</groupId>
-        <artifactId>flume-ng-kudu-sink</artifactId>
+        <groupId>org.apache.flume</groupId>
+        <artifactId>flume-kudu-sink</artifactId>
         <version>${flume-hadoop.version}</version>
       </dependency>
       <dependency>

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
diff --git a/...filter/src/main/java/org/apache/flume/configfilter/HadoopCredentialStoreConfigFilter.java b/...filter/src/main/java/org/apache/flume/configfilter/HadoopCredentialStoreConfigFilter.java
diff --git a/...er/src/test/java/org/apache/flume/configfilter/TestHadoopCredentialStoreConfigFilter.java b/...er/src/test/java/org/apache/flume/configfilter/TestHadoopCredentialStoreConfigFilter.java
diff --git a/...lters/flume-ng-hadoop-credential-store-config-filter/src/test/resources/test-password.txt b/...lters/flume-ng-hadoop-credential-store-config-filter/src/test/resources/test-password.txt
diff --git a/...ters/flume-ng-hadoop-credential-store-config-filter/src/test/resources/test-password2.txt b/...ters/flume-ng-hadoop-credential-store-config-filter/src/test/resources/test-password2.txt
diff --git a/flume-ng-configfilters/pom.xml b/flume-ng-configfilters/pom.xml
@@ -31,7 +31,6 @@ limitations under the License.
 
     <modules>
         <module>flume-ng-environment-variable-config-filter</module>
-        <module>flume-ng-hadoop-credential-store-config-filter</module>
         <module>flume-ng-config-filter-api</module>
         <module>flume-ng-external-process-config-filter</module>
     </modules>