apache · rgoers · May 20, 2026 · May 20, 2026 · Dec 21, 2023 · Dec 21, 2023
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,49 +22,43 @@ on:
       - build-dev
   pull_request:
 
+# Remove all permissions by default. They will be added at a job level.
+permissions: {}
+
 jobs:
   build:
 
     runs-on: ${{ matrix.os }}
+    name: build (${{ matrix.os }})
 
     strategy:
+      # Don't cancel the remaining OS builds when one fails
+      fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest, windows-latest ]
+        java-distribution: [ temurin ]
+        #
+        # There is no protobuf 2.x version for `aarch64`.
+        # Reenable the macOS build after the dependency has been upgraded.
+        #
+        #include:
+        #  # There is no Temurin JDK 8 for ARM
+        #  - os: macos-latest
+        #    java-distribution: zulu
 
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       # JDK 8 is needed for the build, and it is the primary bytecode target.
       - name: Setup JDK 8
-        uses: actions/setup-java@v2.3.0
+        uses: actions/setup-java@v5
         with:
-          distribution: temurin
+          distribution: ${{ matrix.java-distribution }}
           java-version: 8
-          java-package: jdk
-          architecture: x64
           cache: maven
 
-      - name: Inspect environment (Linux)
-        if: runner.os == 'Linux'
-        run: env | grep '^JAVA'
-
-      - name: Inspect environment (MacOS)
-        if: runner.os == 'macOS'
-        run: env | grep '^JAVA'
-
-      - name: Show disk usage before
-        run: df -kh
-
-      - name: Remove unwanted packages
-        run: |
-            sudo rm -rf /usr/share/dotnet
-            sudo rm -rf /usr/local/lib/android
-
-      - name: Show disk usage before maven
-        run: df -kh
-
       - name: Build with Maven
         timeout-minutes: 120
         shell: bash
@@ -73,6 +67,3 @@ jobs:
           --show-version --batch-mode --errors --no-transfer-progress \
           -DtrimStackTrace=false \
           -Dsurefire.rerunFailingTestsCount=2
-
-      - name: Show disk usage after
-        run: df -kh        
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -20,6 +20,9 @@ on:
   schedule:
     - cron: '15 0 * * 5'
 
+# Remove all permissions by default. They will be added at a job level.
+permissions: {}
+
 jobs:
   analyze:
     name: Analyze

diff --git a/.github/workflows/develocity-publish-build-scans.yaml b/.github/workflows/develocity-publish-build-scans.yaml
diff --git 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>1.11.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>Build Support</name>
     <description>Build tools and Configuration</description>
     <properties>

diff --git a/flume-bom/pom.xml b/flume-bom/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
   <parent>
     <groupId>org.apache.flume</groupId>
     <artifactId>flume-project</artifactId>
-    <version>1.11.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -32,18 +32,17 @@ limitations under the License.
   <name>Apache Flume Artifacts</name>
 
   <properties>
-    <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-hadoop.version>2.0.0-SNAPSHOT</flume-hadoop.version>-->
+    <flume-http.version>2.0.0-SNAPSHOT</flume-http.version>
+    <flume-irc.version>2.0.0-SNAPSHOT</flume-irc.version>
     <flume-jdbc.version>2.0.0-SNAPSHOT</flume-jdbc.version>
-    <flume-jms.version>1.11.1-SNAPSHOT</flume-jms.version>
+    <flume-jms.version>2.0.0-SNAPSHOT</flume-jms.version>
     <flume-kafka.version>2.0.0-SNAPSHOT</flume-kafka.version>
-    <flume-log4jappender.version>1.11.1-SNAPSHOT</flume-log4jappender.version>
-    <flume-scribe.version>1.11.1-SNAPSHOT</flume-scribe.version>
+    <flume-scribe.version>2.0.0-SNAPSHOT</flume-scribe.version>
     <flume-spring-boot.version>2.0.0-SNAPSHOT</flume-spring-boot.version>
-    <flume-taildir.version>1.11.1-SNAPSHOT</flume-taildir.version>
-    <flume-tools.version>1.11.1-SNAPSHOT</flume-tools.version>
-    <flume-twitter.version>2.0.0-SNAPSHOT</flume-twitter.version>
+    <flume-taildir.version>2.0.0-SNAPSHOT</flume-taildir.version>
+    <flume-tools.version>2.0.0-SNAPSHOT</flume-tools.version>
+    <!-- <flume-twitter.version>2.0.0-SNAPSHOT</flume-twitter.version> -->
     <flume-legacy.version>2.0.0-SNAPSHOT</flume-legacy.version>
     <flume-morphline.version>2.0.0-SNAPSHOT</flume-morphline.version>
   </properties>
@@ -115,11 +114,11 @@ limitations under the License.
         <artifactId>flume-spring-boot</artifactId>
         <version>${flume-spring-boot.version}</version>
       </dependency>
-      <dependency>
+      <!--<dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-twitter-source</artifactId>
         <version>${flume-twitter.version}</version>
-      </dependency>
+      </dependency>-->
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-jdbc-channel</artifactId>
@@ -145,7 +144,7 @@ limitations under the License.
         <artifactId>flume-spillable-memory-channel</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
+      <!--<dependency>
         <groupId>org.apache.flume.flume-ng-clients</groupId>
         <artifactId>flume-ng-log4jappender</artifactId>
         <version>${flume-log4jappender.version}</version>
@@ -155,7 +154,7 @@ limitations under the License.
         <artifactId>flume-ng-log4jappender</artifactId>
         <version>${flume-log4jappender.version}</version>
         <classifier>jar-with-dependencies</classifier>
-      </dependency>
+      </dependency>-->
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-legacy-thrift-source</artifactId>
@@ -166,7 +165,7 @@ limitations under the License.
         <artifactId>flume-legacy-avro-source</artifactId>
         <version>${flume-legacy.version}</version>
       </dependency>
-      <dependency>
+      <!--<dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-morphline-solr-sink</artifactId>
         <version>${flume-morphline.version}</version>
@@ -180,7 +179,7 @@ limitations under the License.
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-hive-sink</artifactId>
         <version>${flume-hadoop.version}</version>
-      </dependency>
+      </dependency>-->
       <dependency>
         <groupId>org.apache.flume.flume-ng-sinks</groupId>
         <artifactId>flume-http-sink</artifactId>
@@ -191,21 +190,21 @@ limitations under the License.
         <artifactId>flume-irc-sink</artifactId>
         <version>${flume-irc.version}</version>
       </dependency>
-      <dependency>
+      <!--<dependency>
         <groupId>org.apache.flume</groupId>
-        <artifactId>flume-hbase2-sink</artifactId>
+        <artifactId>flume-ng-hbase2-sink</artifactId>
         <version>${flume-hadoop.version}</version>
-      </dependency>
+      </dependency>-->
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-kafka-sink</artifactId>
         <version>${flume-kafka.version}</version>
       </dependency>
-      <dependency>
+      <!--<dependency>
         <groupId>org.apache.flume</groupId>
-        <artifactId>flume-kudu-sink</artifactId>
+        <artifactId>flume-ng-kudu-sink</artifactId>
         <version>${flume-hadoop.version}</version>
-      </dependency>
+      </dependency>-->
       <dependency>
         <groupId>org.apache.flume.flume-ng-sources</groupId>
         <artifactId>flume-jms-source</artifactId>

diff --git 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>1.11.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../flume-parent/pom.xml</relativePath>
   </parent>
 

diff --git 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>1.11.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-channels</groupId>

diff --git 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>1.11.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.flume.flume-ng-channels</groupId>

diff --git 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>1.11.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../flume-parent/pom.xml</relativePath>
   </parent>
 

diff --git 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>1.11.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git 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>1.11.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../flume-parent/pom.xml</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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>flume-ng-configfilters</artifactId>
         <groupId>org.apache.flume</groupId>
-        <version>1.11.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>flume-ng-configfilters</artifactId>
         <groupId>org.apache.flume</groupId>
-        <version>1.11.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>flume-ng-configfilters</artifactId>
         <groupId>org.apache.flume</groupId>
-        <version>1.11.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git 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>1.11.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
       <relativePath>../flume-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git 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>1.11.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../flume-parent/pom.xml</relativePath>
   </parent>
   <artifactId>flume-ng-configuration</artifactId>

diff --git 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>1.11.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../flume-parent/pom.xml</relativePath>
   </parent>