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/logging-flume.git
The following commit(s) were added to refs/heads/trunk by this push:
new 416ddb2de Update version to 2.0.0-SNAPSHOT. disable hadoop builds
(#429)
416ddb2de is described below
commit 416ddb2decf10857104e509f3f6d1ca37d7838b7
Author: Ralph Goers <[email protected]>
AuthorDate: Wed May 20 11:19:09 2026 -0700
Update version to 2.0.0-SNAPSHOT. disable hadoop builds (#429)
* Update version to 2.0.0-SNAPSHOT. disable hadoop builds
* Normalize line endings
* Update Maven Wrapper script
* Upgrade plugins to reproducible build requirements
* updated doap to show Logging Services as their developers
* change pmc to logging as requested by [email protected]
* Fix build issues
* Resolve conflicts
* Add Develocity publishing workflow
* Announce dormant status
* FLUME-3466: Remove morphline-solr-sink module (moved to its own repo)
(#426)
The Morphline Solr Sink has been split out of the Flume monorepo into
its own repository:
https://github.com/apache/logging-flume-morphline
This removes the duplicated in-tree copy under
`flume-ng-sinks/flume-ng-morphline-solr-sink`.
* fix merge conflicts
* Ignore test since hadoop has been removed
* fix: upgrade and simplify build
Merges #427 into this PR.
* fix typo
* fix: missing references
* Revert "fix: missing references"
This reverts commit f9eca83204578f2c0a1cd03d4f6d65384cbafe98.
---------
Co-authored-by: Piotr P. Karwasz <[email protected]>
Co-authored-by: Christian Grobmeier <[email protected]>
Co-authored-by: Jan Friedrich <[email protected]>
Co-authored-by: Volkan Yazıcı <[email protected]>
Co-authored-by: Piotr P. Karwasz <[email protected]>
---
.github/workflows/build.yml | 47 +++++++++-------------
.github/workflows/codeql-analysis.yml | 3 ++
.../workflows/develocity-publish-build-scans.yaml | 40 ------------------
build-support/pom.xml | 2 +-
flume-bom/pom.xml | 43 ++++++++++----------
flume-ng-auth/pom.xml | 2 +-
flume-ng-channels/flume-file-channel/pom.xml | 2 +-
.../flume-spillable-memory-channel/pom.xml | 2 +-
flume-ng-channels/pom.xml | 2 +-
flume-ng-clients/flume-ng-log4jappender/pom.xml | 2 +-
flume-ng-clients/pom.xml | 2 +-
.../flume-ng-config-filter-api/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
flume-ng-configfilters/pom.xml | 2 +-
flume-ng-configuration/pom.xml | 2 +-
flume-ng-core/pom.xml | 2 +-
flume-ng-dist/pom.xml | 30 +++++++-------
flume-ng-embedded-agent/pom.xml | 2 +-
flume-ng-node/pom.xml | 2 +-
flume-ng-sdk/pom.xml | 2 +-
flume-ng-sinks/flume-http-sink/pom.xml | 2 +-
flume-ng-sinks/flume-irc-sink/pom.xml | 2 +-
flume-ng-sinks/pom.xml | 2 +-
flume-ng-sources/flume-jms-source/pom.xml | 2 +-
flume-ng-sources/flume-scribe-source/pom.xml | 2 +-
flume-ng-sources/flume-taildir-source/pom.xml | 2 +-
flume-ng-sources/pom.xml | 2 +-
flume-ng-tests/pom.xml | 2 +-
.../org/apache/flume/test/agent/TestConfig.java | 2 +
flume-parent/pom.xml | 2 +-
flume-tools/pom.xml | 2 +-
pom.xml | 3 +-
33 files changed, 87 insertions(+), 133 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 686e1ed9f..e786b7263 100644
--- 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/[email protected]
+ 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
index b1490d04a..5b7f168a6 100644
--- 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
deleted file mode 100644
index 597d7777c..000000000
--- a/.github/workflows/develocity-publish-build-scans.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-name: Develocity - Publish Maven Build Scans
-
-on:
- workflow_run:
- workflows: [ "build" ]
- types: [ completed ]
-
-jobs:
-
- publish-build-scans:
- runs-on: ubuntu-latest
- permissions:
- actions: write
- pull-requests: write
- steps:
-
- - name: Setup Build Scan link capture
- uses:
gradle/develocity-actions/maven-setup@9f1bf05334de7eb619731d5466c35a153742311d
# 1.2
-
- - name: Publish Build Scans
- uses:
gradle/develocity-actions/maven-publish-build-scan@9f1bf05334de7eb619731d5466c35a153742311d
# 1.2
- with:
- develocity-url: 'https://ge.apache.org'
- develocity-access-key: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/build-support/pom.xml b/build-support/pom.xml
index e520e82df..b14795219 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>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
index d05d2aff0..e672ac445 100644
--- 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
index 766eda5af..e213d7844 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>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
index 6bfc85f5e..6db659c86 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>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
index d89fba71b..bd7c6be17 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>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
index d47523673..9bf2ba17b 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>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
index 83fd9586d..6e751849a 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>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
index 70b5348e3..d54c46c5d 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>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
index 839ffb95f..18c8b0d4e 100644
--- 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
index 55fbaa60f..5fce7ede0 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,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
index 940945991..64679ec34 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,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
index 7cc35884a..6e7f99c18 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>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
index 218e06657..edb67e188 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>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
index 2ea97b734..4b8efeb9a 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../flume-parent/pom.xml</relativePath>
</parent>
diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml
index b2e400250..3d88b045e 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../flume-parent/pom.xml</relativePath>
</parent>
@@ -132,7 +132,7 @@
<groupId>org.apache.flume</groupId>
<artifactId>flume-kafka-channel</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-hdfs-sink</artifactId>
</dependency>
@@ -143,23 +143,23 @@
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-hbase2-sink</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-http-sink</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-morphline-solr-sink</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-kafka-sink</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-hive-sink</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-scribe-source</artifactId>
@@ -168,22 +168,22 @@
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-jms-source</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-twitter-source</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-kafka-source</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-legacy-avro-source</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-legacy-thrift-source</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-taildir-source</artifactId>
@@ -192,10 +192,10 @@
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-environment-variable-config-filter</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-hadoop-credential-store-config-filter</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-external-process-config-filter</artifactId>
@@ -204,7 +204,7 @@
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-config-filter-api</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.flume.flume-ng-clients</groupId>
<artifactId>flume-ng-log4jappender</artifactId>
<exclusions>
@@ -224,7 +224,7 @@
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-tools</artifactId>
diff --git a/flume-ng-embedded-agent/pom.xml b/flume-ng-embedded-agent/pom.xml
index 79ba5595c..c49388dc0 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../flume-parent/pom.xml</relativePath>
</parent>
diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml
index 2f7453f66..99ed535c3 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../flume-parent/pom.xml</relativePath>
</parent>
diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml
index 08d0aa32e..1fe90ed22 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../flume-parent/pom.xml</relativePath>
</parent>
diff --git a/flume-ng-sinks/flume-http-sink/pom.xml
b/flume-ng-sinks/flume-http-sink/pom.xml
index 936cfda07..d4ac3f52a 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
diff --git a/flume-ng-sinks/flume-irc-sink/pom.xml
b/flume-ng-sinks/flume-irc-sink/pom.xml
index c40eaddb8..53a5f4fe6 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
diff --git a/flume-ng-sinks/pom.xml b/flume-ng-sinks/pom.xml
index 806cb1afa..5f6240a9c 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../flume-parent/pom.xml</relativePath>
</parent>
diff --git a/flume-ng-sources/flume-jms-source/pom.xml
b/flume-ng-sources/flume-jms-source/pom.xml
index 7c2bd61ec..f34b767b0 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sources</groupId>
diff --git a/flume-ng-sources/flume-scribe-source/pom.xml
b/flume-ng-sources/flume-scribe-source/pom.xml
index dd5e082e0..83405dc65 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sources</groupId>
diff --git a/flume-ng-sources/flume-taildir-source/pom.xml
b/flume-ng-sources/flume-taildir-source/pom.xml
index b5a74d7c4..8217aafd0 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sources</groupId>
diff --git a/flume-ng-sources/pom.xml b/flume-ng-sources/pom.xml
index 4ecf06f4b..45cf503d3 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../flume-parent/pom.xml</relativePath>
</parent>
diff --git a/flume-ng-tests/pom.xml b/flume-ng-tests/pom.xml
index da3ecfa43..e9afe2697 100644
--- a/flume-ng-tests/pom.xml
+++ b/flume-ng-tests/pom.xml
@@ -24,7 +24,7 @@
<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-tests/src/test/java/org/apache/flume/test/agent/TestConfig.java
b/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestConfig.java
index 7a89c5290..8ae8234ad 100644
--- a/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestConfig.java
+++ b/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestConfig.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.util.ToolRunner;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.contrib.java.lang.system.EnvironmentVariables;
import org.slf4j.Logger;
@@ -49,6 +50,7 @@ import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+@Ignore
public class TestConfig {
private static final Logger LOGGER =
LoggerFactory.getLogger(TestConfig.class);
diff --git a/flume-parent/pom.xml b/flume-parent/pom.xml
index 4e4203e76..536a74d83 100644
--- a/flume-parent/pom.xml
+++ b/flume-parent/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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Flume</name>
diff --git a/flume-tools/pom.xml b/flume-tools/pom.xml
index 9bd229924..7d80f5d1c 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>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../flume-parent/pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 771e93225..f4e8f1541 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-project</artifactId>
- <version>1.11.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Flume Project</name>
@@ -38,7 +38,6 @@ limitations under the License.
<module>flume-ng-core</module>
<module>flume-ng-configuration</module>
<module>flume-ng-embedded-agent</module>
- <module>flume-ng-sinks</module>
<module>flume-ng-sources</module>
<module>flume-ng-node</module>
<module>flume-ng-dist</module>
