Skip to content

Commit 416ddb2

Browse files
rgoersppkarwaszgrobmeierFreeAndNilvy
authored
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 sebbaz@gmail.com * 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 f9eca83. --------- Co-authored-by: Piotr P. Karwasz <piotr.github@karwasz.org> Co-authored-by: Christian Grobmeier <cg@grobmeier.de> Co-authored-by: Jan Friedrich <freeandnil@apache.org> Co-authored-by: Volkan Yazıcı <volkan@yazi.ci> Co-authored-by: Piotr P. Karwasz <pkarwasz-github@apache.org>
1 parent 99de0cd commit 416ddb2

33 files changed

Lines changed: 87 additions & 133 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,43 @@ on:
2222
- build-dev
2323
pull_request:
2424

25+
# Remove all permissions by default. They will be added at a job level.
26+
permissions: {}
27+
2528
jobs:
2629
build:
2730

2831
runs-on: ${{ matrix.os }}
32+
name: build (${{ matrix.os }})
2933

3034
strategy:
35+
# Don't cancel the remaining OS builds when one fails
36+
fail-fast: false
3137
matrix:
32-
os: [ ubuntu-latest, macos-latest ]
38+
os: [ ubuntu-latest, windows-latest ]
39+
java-distribution: [ temurin ]
40+
#
41+
# There is no protobuf 2.x version for `aarch64`.
42+
# Reenable the macOS build after the dependency has been upgraded.
43+
#
44+
#include:
45+
# # There is no Temurin JDK 8 for ARM
46+
# - os: macos-latest
47+
# java-distribution: zulu
3348

3449
steps:
3550

3651
- name: Checkout repository
37-
uses: actions/checkout@v2
52+
uses: actions/checkout@v6
3853

3954
# JDK 8 is needed for the build, and it is the primary bytecode target.
4055
- name: Setup JDK 8
41-
uses: actions/setup-java@v2.3.0
56+
uses: actions/setup-java@v5
4257
with:
43-
distribution: temurin
58+
distribution: ${{ matrix.java-distribution }}
4459
java-version: 8
45-
java-package: jdk
46-
architecture: x64
4760
cache: maven
4861

49-
- name: Inspect environment (Linux)
50-
if: runner.os == 'Linux'
51-
run: env | grep '^JAVA'
52-
53-
- name: Inspect environment (MacOS)
54-
if: runner.os == 'macOS'
55-
run: env | grep '^JAVA'
56-
57-
- name: Show disk usage before
58-
run: df -kh
59-
60-
- name: Remove unwanted packages
61-
run: |
62-
sudo rm -rf /usr/share/dotnet
63-
sudo rm -rf /usr/local/lib/android
64-
65-
- name: Show disk usage before maven
66-
run: df -kh
67-
6862
- name: Build with Maven
6963
timeout-minutes: 120
7064
shell: bash
@@ -73,6 +67,3 @@ jobs:
7367
--show-version --batch-mode --errors --no-transfer-progress \
7468
-DtrimStackTrace=false \
7569
-Dsurefire.rerunFailingTestsCount=2
76-
77-
- name: Show disk usage after
78-
run: df -kh

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ on:
2020
schedule:
2121
- cron: '15 0 * * 5'
2222

23+
# Remove all permissions by default. They will be added at a job level.
24+
permissions: {}
25+
2326
jobs:
2427
analyze:
2528
name: Analyze

‎.github/workflows/develocity-publish-build-scans.yaml‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎build-support/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ limitations under the License.
2222

2323
<groupId>org.apache.flume</groupId>
2424
<artifactId>build-support</artifactId>
25-
<version>1.11.1-SNAPSHOT</version>
25+
<version>2.0.0-SNAPSHOT</version>
2626
<name>Build Support</name>
2727
<description>Build tools and Configuration</description>
2828
<properties>

‎flume-bom/pom.xml‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ limitations under the License.
2121
<parent>
2222
<groupId>org.apache.flume</groupId>
2323
<artifactId>flume-project</artifactId>
24-
<version>1.11.1-SNAPSHOT</version>
24+
<version>2.0.0-SNAPSHOT</version>
2525
</parent>
2626

2727
<modelVersion>4.0.0</modelVersion>
@@ -32,18 +32,17 @@ limitations under the License.
3232
<name>Apache Flume Artifacts</name>
3333

3434
<properties>
35-
<flume-hadoop.version>2.0.0-SNAPSHOT</flume-hadoop.version>
36-
<flume-http.version>1.11.1-SNAPSHOT</flume-http.version>
37-
<flume-irc.version>1.11.1-SNAPSHOT</flume-irc.version>
35+
<!-- <flume-hadoop.version>2.0.0-SNAPSHOT</flume-hadoop.version>-->
36+
<flume-http.version>2.0.0-SNAPSHOT</flume-http.version>
37+
<flume-irc.version>2.0.0-SNAPSHOT</flume-irc.version>
3838
<flume-jdbc.version>2.0.0-SNAPSHOT</flume-jdbc.version>
39-
<flume-jms.version>1.11.1-SNAPSHOT</flume-jms.version>
39+
<flume-jms.version>2.0.0-SNAPSHOT</flume-jms.version>
4040
<flume-kafka.version>2.0.0-SNAPSHOT</flume-kafka.version>
41-
<flume-log4jappender.version>1.11.1-SNAPSHOT</flume-log4jappender.version>
42-
<flume-scribe.version>1.11.1-SNAPSHOT</flume-scribe.version>
41+
<flume-scribe.version>2.0.0-SNAPSHOT</flume-scribe.version>
4342
<flume-spring-boot.version>2.0.0-SNAPSHOT</flume-spring-boot.version>
44-
<flume-taildir.version>1.11.1-SNAPSHOT</flume-taildir.version>
45-
<flume-tools.version>1.11.1-SNAPSHOT</flume-tools.version>
46-
<flume-twitter.version>2.0.0-SNAPSHOT</flume-twitter.version>
43+
<flume-taildir.version>2.0.0-SNAPSHOT</flume-taildir.version>
44+
<flume-tools.version>2.0.0-SNAPSHOT</flume-tools.version>
45+
<!-- <flume-twitter.version>2.0.0-SNAPSHOT</flume-twitter.version> -->
4746
<flume-legacy.version>2.0.0-SNAPSHOT</flume-legacy.version>
4847
<flume-morphline.version>2.0.0-SNAPSHOT</flume-morphline.version>
4948
</properties>
@@ -115,11 +114,11 @@ limitations under the License.
115114
<artifactId>flume-spring-boot</artifactId>
116115
<version>${flume-spring-boot.version}</version>
117116
</dependency>
118-
<dependency>
117+
<!--<dependency>
119118
<groupId>org.apache.flume</groupId>
120119
<artifactId>flume-twitter-source</artifactId>
121120
<version>${flume-twitter.version}</version>
122-
</dependency>
121+
</dependency>-->
123122
<dependency>
124123
<groupId>org.apache.flume</groupId>
125124
<artifactId>flume-jdbc-channel</artifactId>
@@ -145,7 +144,7 @@ limitations under the License.
145144
<artifactId>flume-spillable-memory-channel</artifactId>
146145
<version>${project.version}</version>
147146
</dependency>
148-
<dependency>
147+
<!--<dependency>
149148
<groupId>org.apache.flume.flume-ng-clients</groupId>
150149
<artifactId>flume-ng-log4jappender</artifactId>
151150
<version>${flume-log4jappender.version}</version>
@@ -155,7 +154,7 @@ limitations under the License.
155154
<artifactId>flume-ng-log4jappender</artifactId>
156155
<version>${flume-log4jappender.version}</version>
157156
<classifier>jar-with-dependencies</classifier>
158-
</dependency>
157+
</dependency>-->
159158
<dependency>
160159
<groupId>org.apache.flume</groupId>
161160
<artifactId>flume-legacy-thrift-source</artifactId>
@@ -166,7 +165,7 @@ limitations under the License.
166165
<artifactId>flume-legacy-avro-source</artifactId>
167166
<version>${flume-legacy.version}</version>
168167
</dependency>
169-
<dependency>
168+
<!--<dependency>
170169
<groupId>org.apache.flume</groupId>
171170
<artifactId>flume-morphline-solr-sink</artifactId>
172171
<version>${flume-morphline.version}</version>
@@ -180,7 +179,7 @@ limitations under the License.
180179
<groupId>org.apache.flume</groupId>
181180
<artifactId>flume-hive-sink</artifactId>
182181
<version>${flume-hadoop.version}</version>
183-
</dependency>
182+
</dependency>-->
184183
<dependency>
185184
<groupId>org.apache.flume.flume-ng-sinks</groupId>
186185
<artifactId>flume-http-sink</artifactId>
@@ -191,21 +190,21 @@ limitations under the License.
191190
<artifactId>flume-irc-sink</artifactId>
192191
<version>${flume-irc.version}</version>
193192
</dependency>
194-
<dependency>
193+
<!--<dependency>
195194
<groupId>org.apache.flume</groupId>
196-
<artifactId>flume-hbase2-sink</artifactId>
195+
<artifactId>flume-ng-hbase2-sink</artifactId>
197196
<version>${flume-hadoop.version}</version>
198-
</dependency>
197+
</dependency>-->
199198
<dependency>
200199
<groupId>org.apache.flume</groupId>
201200
<artifactId>flume-kafka-sink</artifactId>
202201
<version>${flume-kafka.version}</version>
203202
</dependency>
204-
<dependency>
203+
<!--<dependency>
205204
<groupId>org.apache.flume</groupId>
206-
<artifactId>flume-kudu-sink</artifactId>
205+
<artifactId>flume-ng-kudu-sink</artifactId>
207206
<version>${flume-hadoop.version}</version>
208-
</dependency>
207+
</dependency>-->
209208
<dependency>
210209
<groupId>org.apache.flume.flume-ng-sources</groupId>
211210
<artifactId>flume-jms-source</artifactId>

‎flume-ng-auth/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ limitations under the License.
2121
<parent>
2222
<artifactId>flume-parent</artifactId>
2323
<groupId>org.apache.flume</groupId>
24-
<version>1.11.1-SNAPSHOT</version>
24+
<version>2.0.0-SNAPSHOT</version>
2525
<relativePath>../flume-parent/pom.xml</relativePath>
2626
</parent>
2727

‎flume-ng-channels/flume-file-channel/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<artifactId>flume-ng-channels</artifactId>
2626
<groupId>org.apache.flume</groupId>
27-
<version>1.11.1-SNAPSHOT</version>
27+
<version>2.0.0-SNAPSHOT</version>
2828
</parent>
2929

3030
<groupId>org.apache.flume.flume-ng-channels</groupId>

‎flume-ng-channels/flume-spillable-memory-channel/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<artifactId>flume-ng-channels</artifactId>
2626
<groupId>org.apache.flume</groupId>
27-
<version>1.11.1-SNAPSHOT</version>
27+
<version>2.0.0-SNAPSHOT</version>
2828
</parent>
2929

3030
<groupId>org.apache.flume.flume-ng-channels</groupId>

‎flume-ng-channels/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ limitations under the License.
2323
<parent>
2424
<artifactId>flume-parent</artifactId>
2525
<groupId>org.apache.flume</groupId>
26-
<version>1.11.1-SNAPSHOT</version>
26+
<version>2.0.0-SNAPSHOT</version>
2727
<relativePath>../flume-parent/pom.xml</relativePath>
2828
</parent>
2929

‎flume-ng-clients/flume-ng-log4jappender/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ limitations under the License.
2121
<parent>
2222
<artifactId>flume-ng-clients</artifactId>
2323
<groupId>org.apache.flume</groupId>
24-
<version>1.11.1-SNAPSHOT</version>
24+
<version>2.0.0-SNAPSHOT</version>
2525
<relativePath>..</relativePath>
2626
</parent>
2727

0 commit comments

Comments
 (0)