diff --git a/flume-bom/pom.xml b/flume-bom/pom.xml
index 90fcb70f4d..67ce79ed2e 100644
--- a/flume-bom/pom.xml
+++ b/flume-bom/pom.xml
@@ -235,4 +235,42 @@
     </dependencies>
   </dependencyManagement>
 
+  <build>
+    <plugins>
+
+      <!-- Enable BOM flattening -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.7.3</version>
+        <executions>
+          <execution>
+            <id>flatten-bom</id>
+            <goals>
+              <goal>flatten</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <inherited>false</inherited>
+            <configuration>
+              <updatePomFile>true</updatePomFile>
+              <flattenMode>bom</flattenMode>
+              <pomElements>
+                <dependencyManagement>resolve</dependencyManagement>
+                <properties>flatten</properties>
+              </pomElements>
+            </configuration>
+          </execution>
+          <!-- ensure proper cleanup -->
+          <execution>
+            <id>flatten.clean</id>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+
 </project>
diff --git a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java
index 8a63720de9..84d8d85334 100644
--- a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java
+++ b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestMultiportSyslogTCPSource.java
@@ -212,6 +212,7 @@ public void testMultiplePortsSSL() throws Exception {
         SSLContext sslContext = SSLContext.getInstance("TLS");
         sslContext.init(
                 null,
+                // lgtm [java/insecure-trustmanager]
                 new TrustManager[] {
                     new X509TrustManager() {
                         @Override
diff --git a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogTcpSource.java b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogTcpSource.java
index fbfd874039..6c015af7dc 100644
--- a/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogTcpSource.java
+++ b/flume-ng-sources/flume-syslog-source/src/test/java/org/apache/flume/source/syslog/TestSyslogTcpSource.java
@@ -247,6 +247,7 @@ public void testSSLMessages() throws Exception {
         SSLContext sslContext = SSLContext.getInstance("TLS");
         sslContext.init(
                 null,
+                // lgtm [java/insecure-trustmanager]
                 new TrustManager[] {
                     new X509TrustManager() {
                         @Override
diff --git a/flume-parent/pom.xml b/flume-parent/pom.xml
index a4fd6fa758..c9f381ce4f 100644
--- a/flume-parent/pom.xml
+++ b/flume-parent/pom.xml
@@ -991,7 +991,7 @@
           <artifactId>maven-pmd-plugin</artifactId>
           <version>${mvn-pmd-plugin.version}</version>
           <configuration>
-            <targetJdk>${targetJavaVersion}</targetJdk>
+            <targetJdk>${releaseJavaVersion}</targetJdk>
             <excludeRoots>
               <excludeRoot>${project.build.directory}/generated-sources</excludeRoot>
             </excludeRoots>
@@ -1207,6 +1207,38 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
       </plugin>
+      <!-- Enable Parent POM flattening -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.7.3</version>
+        <executions>
+          <execution>
+            <id>flatten-bom</id>
+            <goals>
+              <goal>flatten</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <inherited>false</inherited>
+            <configuration>
+              <updatePomFile>true</updatePomFile>
+              <flattenMode>bom</flattenMode>
+              <pomElements>
+                <dependencyManagement>resolve</dependencyManagement>
+                <pluginManagement>resolve</pluginManagement>
+                <properties>flatten</properties>
+              </pomElements>
+            </configuration>
+          </execution>
+          <!-- ensure proper cleanup -->
+          <execution>
+            <id>flatten.clean</id>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <extensions>
       <extension>