This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-flume-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 905c764 Upgrade the spring boot version (#10)
905c764 is described below
commit 905c7649fe0a8d37921918f99d96acd967e05bd5
Author: Ralph Goers <[email protected]>
AuthorDate: Thu Sep 10 22:47:47 2026 -0700
Upgrade the spring boot version (#10)
* Upgrade the spring boot version
* Update the flume-spring-boot version. Add new method to
AbstractFlumeConfiguration
---
flume-spring-boot/pom.xml | 14 +---------
.../boot/config/AbstractFlumeConfiguration.java | 18 +++++++++++++
pom.xml | 31 ++++++++++++++++++++--
3 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/flume-spring-boot/pom.xml b/flume-spring-boot/pom.xml
index bfdefc5..de73d13 100644
--- a/flume-spring-boot/pom.xml
+++ b/flume-spring-boot/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.flume</groupId>
<artifactId>flume-spring-boot-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -29,20 +29,8 @@
<properties>
<module.name>org.apache.flume.spring.boot</module.name>
- <spring-boot.version>4.1.0</spring-boot.version>
<gson.version>2.14.0</gson.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring-boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
diff --git
a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/AbstractFlumeConfiguration.java
b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/AbstractFlumeConfiguration.java
index 962917b..880503f 100644
---
a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/AbstractFlumeConfiguration.java
+++
b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/AbstractFlumeConfiguration.java
@@ -35,6 +35,7 @@ import org.apache.flume.channel.ReplicatingChannelSelector;
import org.apache.flume.conf.Configurables;
import org.apache.flume.conf.channel.ChannelType;
import org.apache.flume.interceptor.Interceptor;
+import org.apache.flume.sink.DefaultSinkProcessor;
/**
* The primarily provides helper methods to create and configure the various
Flume components.
@@ -139,6 +140,23 @@ public abstract class AbstractFlumeConfiguration {
return processor;
}
+ /**
+ * Set up the SinkProcessors and SinkRunners for a list of Sinks where
each sink handles a channel.
+ * @param sinks The List of Sinks.
+ * @return A Map of the SinkRunners
+ */
+ protected Map<String, SinkRunner> createSinkRunners(List<Sink> sinks) {
+ Map<String, SinkRunner> sinkRunners = new HashMap<>();
+ for (Sink sink : sinks) {
+ SinkProcessor processor = new DefaultSinkProcessor();
+ processor.setSinks(List.of(sink));
+ Context context = createContext(Map.of());
+ processor.configure(context);
+ sinkRunners.put(sink.getName(), new SinkRunner(processor));
+ }
+ return sinkRunners;
+ }
+
/**
* Set up the SinkProcessors and SinkRunners for a list of Sinks.
* @param processorProperties The SinkProcessor's parameters.
diff --git a/pom.xml b/pom.xml
index a432e7a..7fcb6ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.flume</groupId>
<artifactId>flume-spring-boot-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Flume Spring Boot Parent</name>
@@ -105,7 +105,7 @@
<mvn-javadoc-plugin.version>2.9</mvn-javadoc-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<rat.version>0.12</rat.version>
- <spring-boot.version>4.1.0</spring-boot.version>
+ <spring-boot.version>4.1.1</spring-boot.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -123,6 +123,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- Override the versions in this repo -->
<dependency>
<groupId>org.apache.flume</groupId>
@@ -185,6 +192,26 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
+ <!-- Use a recent version -->
+ <configuration>
+ <compilerArgs>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
</plugins>
</build>
