diff --git a/nifi-commons/nifi-expression-language/pom.xml b/nifi-commons/nifi-expression-language/pom.xml
index 17bf8b2ec3df..46d18102791f 100644
--- a/nifi-commons/nifi-expression-language/pom.xml
+++ b/nifi-commons/nifi-expression-language/pom.xml
@@ -34,6 +34,36 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin><!-- workaround for https://github.com/antlr/antlr3/pull/209 -->
+              <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <basedir>${project.build.directory}/generated-sources/antlr3/org/apache/nifi/attribute/expression/language/antlr</basedir>
+                    <includes>
+                        <include>*.java</include>
+                    </includes>
+                    <replacements>
+                        <replacement>
+                            <token>(// .ANTLR .+) ....-..-.. ..:..:..</token>
+                            <value>$1</value>
+                        </replacement>
+                        <replacement>
+                            <token>(// elements: ).*</token>
+                            <value>$1</value>
+                        </replacement>
+                    </replacements>
+                    <regex>true</regex>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi-commons/nifi-hl7-query-language/pom.xml
index 437fe235688e..8fdf0d7d65a0 100644
--- a/nifi-commons/nifi-hl7-query-language/pom.xml
+++ b/nifi-commons/nifi-hl7-query-language/pom.xml
@@ -45,6 +45,36 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin><!-- workaround for https://github.com/antlr/antlr3/pull/209 -->
+              <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <basedir>${project.build.directory}/generated-sources/antlr3/org/apache/nifi/hl7/query/antlr</basedir>
+                    <includes>
+                        <include>*.java</include>
+                    </includes>
+                    <replacements>
+                        <replacement>
+                            <token>(// .ANTLR .+) ....-..-.. ..:..:..</token>
+                            <value>$1</value>
+                        </replacement>
+                        <replacement>
+                            <token>(// elements: ).*</token>
+                            <value>$1</value>
+                        </replacement>
+                    </replacements>
+                    <regex>true</regex>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/nifi-commons/nifi-record-path/pom.xml b/nifi-commons/nifi-record-path/pom.xml
index 923aa26e5c2e..d28b2cafa35d 100644
--- a/nifi-commons/nifi-record-path/pom.xml
+++ b/nifi-commons/nifi-record-path/pom.xml
@@ -36,6 +36,36 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin><!-- workaround for https://github.com/antlr/antlr3/pull/209 -->
+              <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <basedir>${project.build.directory}/generated-sources/antlr3/org/apache/nifi/record/path</basedir>
+                    <includes>
+                        <include>*.java</include>
+                    </includes>
+                    <replacements>
+                        <replacement>
+                            <token>(// .ANTLR .+) ....-..-.. ..:..:..</token>
+                            <value>$1</value>
+                        </replacement>
+                        <replacement>
+                            <token>(// elements: ).*</token>
+                            <value>$1</value>
+                        </replacement>
+                    </replacements>
+                    <regex>true</regex>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index c294be47e6c7..cc08bc43d0ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -718,6 +718,9 @@
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>jaxb2-maven-plugin</artifactId>
                     <version>2.5.0</version>
+                    <configuration>
+                        <noGeneratedHeaderComments>true</noGeneratedHeaderComments>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -1050,6 +1053,9 @@
                             <groupId>org.jvnet.jaxb2.maven2</groupId>
                             <artifactId>maven-jaxb2-plugin</artifactId>
                             <version>0.14.0</version>
+                            <configuration>
+                                <noFileHeader>true</noFileHeader>
+                            </configuration>
                         </plugin>
                     </plugins>
                 </pluginManagement>