HSEARCH-4522 Use maven-compiler-plugin to apply jboss-logging-processor

This seems to get rid of some problems with the eclipse compiler. I don't really understand what those problems are, but since this configuration is less exotic than what we used to have, I won't investigate.
hibernate · Apr 1, 2022 · dab0b0a · dab0b0a
1 parent 659097c
commit dab0b0a
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 53 deletions.
diff --git a/jakarta/util/internal/test/orm/pom.xml b/jakarta/util/internal/test/orm/pom.xml
@@ -39,10 +39,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/orm6/util/internal/test/orm/pom.xml b/orm6/util/internal/test/orm/pom.xml
@@ -39,10 +39,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/parents/public/pom.xml b/parents/public/pom.xml
@@ -138,10 +138,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -1695,8 +1695,6 @@
                         <release>${maven.compiler.release}</release>
                         <testRelease>${maven.compiler.testRelease}</testRelease>
                         <encoding>UTF-8</encoding>
-                        <!-- needed because of compiler bug: http://bugs.sun.com/view_bug.do?bug_id=6512707 -->
-                        <proc>none</proc>
                         <compilerArgs>
                             <compilerArg>-Xlint:unchecked</compilerArg>
                         </compilerArgs>
@@ -1707,12 +1705,25 @@
                             <configuration>
                                 <fork>true</fork>
                                 <executable>${java-version.main.compiler}</executable>
+                                <annotationProcessorPaths>
+                                    <path>
+                                        <groupId>org.jboss.logging</groupId>
+                                        <artifactId>jboss-logging-processor</artifactId>
+                                        <version>${version.org.jboss.logging.jboss-logging-tools}</version>
+                                    </path>
+                                    <path>
+                                        <groupId>org.jboss.logging</groupId>
+                                        <artifactId>jboss-logging</artifactId>
+                                        <version>${version.org.jboss.logging.jboss-logging}</version>
+                                    </path>
+                                </annotationProcessorPaths>
                             </configuration>
                         </execution>
                         <execution>
                             <id>default-testCompile</id>
                             <configuration>
                                 <fork>true</fork>
+                                <proc>none</proc>
                                 <executable>${java-version.test.compiler}</executable>
                             </configuration>
                         </execution>
@@ -1722,31 +1733,6 @@
                     <groupId>org.bsc.maven</groupId>
                     <artifactId>maven-processor-plugin</artifactId>
                     <version>${version.processor.plugin}</version>
-                    <executions>
-                        <!-- Run annotation processors on src/main/java sources -->
-                        <execution>
-                            <id>process</id>
-                            <goals>
-                                <goal>process</goal>
-                            </goals>
-                            <phase>process-sources</phase>
-                            <configuration>
-                                <processors>
-                                    <processor>org.jboss.logging.processor.apt.LoggingToolsProcessor</processor>
-                                </processors>
-                                <!-- Necessary for the Jakarta artifacts, where sources are copied from other modules -->
-                                <addCompileSourceRoots>true</addCompileSourceRoots>
-                            </configuration>
-                        </execution>
-                    </executions>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.jboss.logging</groupId>
-                            <artifactId>jboss-logging-processor</artifactId>
-                            <version>${version.org.jboss.logging.jboss-logging-tools}</version>
-                            <scope>compile</scope>
-                        </dependency>
-                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
@@ -2547,17 +2533,20 @@
                 </property>
             </activation>
             <dependencies>
+                <!-- Intellij IDEA doesn't understand <annotationProcessorPaths> in
+                     the maven-compiler-plugin configuration, so we need this in order
+                     for compilation to work in the IDE. -->
                 <dependency>
                     <groupId>org.jboss.logging</groupId>
                     <artifactId>jboss-logging-processor</artifactId>
                     <version>${version.org.jboss.logging.jboss-logging-tools}</version>
-                    <scope>compile</scope>
+                    <scope>provided</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.openjdk.jmh</groupId>
                     <artifactId>jmh-generator-annprocess</artifactId>
                     <version>${version.org.openjdk.jmh}</version>
-                    <scope>compile</scope>
+                    <scope>provided</scope>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/util/internal/integrationtest/v5migrationhelper/pom.xml b/util/internal/integrationtest/v5migrationhelper/pom.xml
@@ -80,10 +80,6 @@
                     <failOnWarning>false</failOnWarning>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

diff --git a/util/internal/test/common/pom.xml b/util/internal/test/common/pom.xml
@@ -84,10 +84,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>

diff --git a/util/internal/test/orm/pom.xml b/util/internal/test/orm/pom.xml
@@ -36,10 +36,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>