Re-enabled rewrite-maven-plugin in both development and jenkins builds

ao-apps · May 13, 2022 · d26af34 · d26af34
1 parent d143d26
commit d26af34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx b/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx
@@ -37,7 +37,7 @@ along with ao-oss-parent.  If not, see <https://www.gnu.org/licenses/>.
     shortTitle="Changelog"
     tocLevels="1"
     datePublished="2016-10-29T20:54:46-05:00"
-    dateModified="2022-05-02T01:08:37-05:00"
+    dateModified="2022-05-12T21:05:20-05:00"
   >
     <c:if test="${fn:endsWith('@{project.version}', '-SNAPSHOT') and !fn:endsWith('@{project.version}', '-POST-SNAPSHOT')}">
       <changelog:release
@@ -59,9 +59,6 @@ along with ao-oss-parent.  If not, see <https://www.gnu.org/licenses/>.
             The previous mitigation was applied too broadly and broke the search URLs for projects with modules.
           </li>
           <li>Reduced size of Javadoc top section and fixed scroll position in Java 11.</li>
-          <!--
-            TODO: The formatting applied by rewrite-maven-plugin is inconsistent with the rules enforced by
-            maven-checkstyle-plugin.  Find a compatible configuration then re-enable rewrite-maven-plugin.
           <li>
             <p>
               Enabled <ao:a href="https://docs.openrewrite.org/">OpenRewrite</ao:a> on all builds using
@@ -77,7 +74,6 @@ along with ao-oss-parent.  If not, see <https://www.gnu.org/licenses/>.
               <code><![CDATA[&lt;failOnDryRunResults&gt;false&lt;/failOnDryRunResults&gt;]]></code>.
             </p>
           </li>
-          -->
           <li>
             <p>
               Enabled <ao:a href="https://checkstyle.org/">Checkstyle</ao:a> on all builds using

diff --git a/pom.xml b/pom.xml
@@ -105,11 +105,7 @@ along with ao-oss-parent.  If not, see <https://www.gnu.org/licenses/>.
     <!-- Set to "-POST-SNAPSHOT" by activating the "POST-SNAPSHOT" profile to use post-release dependencies -->
     <POST-SNAPSHOT><!-- -POST-SNAPSHOT --></POST-SNAPSHOT>
     <!-- rewrite-maven-plugin -->
-    <!--
-      TODO: The formatting applied by rewrite-maven-plugin is inconsistent with the rules enforced by
-      maven-checkstyle-plugin.  Find a compatible configuration then re-enable rewrite-maven-plugin.
-    -->
-    <rewrite.phase>none<!-- TODO: verify --></rewrite.phase>
+    <rewrite.phase>verify</rewrite.phase>
     <rewrite.goal>dryRunNoFork</rewrite.goal>
     <!-- com.aoapps is on new Sonatype Nexus Repository Manager -->
     <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
@@ -2284,7 +2280,7 @@ along with ao-oss-parent.  If not, see <https://www.gnu.org/licenses/>.
       <id>development</id><activation><file><exists>profile.d/development</exists></file></activation>
       <properties>
         <!-- rewrite-maven-plugin -->
-        <rewrite.phase>none<!-- TODO: process-sources --></rewrite.phase>
+        <rewrite.phase>process-sources</rewrite.phase>
         <rewrite.goal>runNoFork</rewrite.goal>
         <!-- Never stage development builds -->
         <nexus.skipNexusStagingDeployMojo>true</nexus.skipNexusStagingDeployMojo>
@@ -2353,7 +2349,7 @@ along with ao-oss-parent.  If not, see <https://www.gnu.org/licenses/>.
       <id>jenkins</id>
       <properties>
         <!-- rewrite-maven-plugin -->
-        <rewrite.phase>none<!-- TODO: verify --></rewrite.phase>
+        <rewrite.phase>verify</rewrite.phase>
         <rewrite.goal>dryRunNoFork</rewrite.goal>
       </properties>
       <build>