Merge prettierSkip and rewrite skip into formattingSkip profile

Author: optionsome

.github/workflows/cibuild.yml

@@ -56,7 +56,7 @@ jobs:
               exit 1;
           fi
           mvn jacoco:prepare-agent test jacoco:report -P prettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm
-          mvn package -Dmaven.test.skip -P prettierSkip
+          mvn package -Dmaven.test.skip -P formattingSkip
 
       - name: Send coverage data to codecov.io
         if: github.repository_owner == 'opentripplanner'
@@ -77,7 +77,7 @@ jobs:
         if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev-1.x' || github.ref == 'refs/heads/dev-2.x')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: mvn deploy --settings maven-settings.xml -DskipTests -DGITHUB_REPOSITORY=$GITHUB_REPOSITORY -P prettierSkip -P deployGitHub
+        run: mvn deploy --settings maven-settings.xml -DskipTests -DGITHUB_REPOSITORY=$GITHUB_REPOSITORY -P formattingSkip -P deployGitHub
 
   build-windows:
     timeout-minutes: 20
@@ -95,7 +95,7 @@ jobs:
       - name: Configure Windows Pagefile
         uses: al-cheb/[email protected]
       - name: Run tests
-        run: mvn test -P prettierSkip
+        run: mvn test -P formattingSkip
 
   docs:
     if: github.repository_owner == 'opentripplanner'
@@ -208,7 +208,7 @@ jobs:
           distribution: temurin
           cache: maven
       - name: Compile Java code
-        run: mvn compile -DskipTests -P prettierSkip
+        run: mvn compile -DskipTests -P formattingSkip
 
   container-image:
     if: github.repository_owner == 'opentripplanner' && github.event_name == 'push' && (github.ref == 'refs/heads/dev-2.x' || github.ref == 'refs/heads/master')
@@ -251,6 +251,6 @@ jobs:
             echo "Maven version ${version_with_snapshot} contains SNAPSHOT, adding date to container image tag"
           fi
           
-          MAVEN_SKIP_ARGS="-P prettierSkip -Dmaven.test.skip=true -Dmaven.source.skip=true"
+          MAVEN_SKIP_ARGS="-P formattingSkip -Dmaven.test.skip=true -Dmaven.source.skip=true"
           
           mvn $MAVEN_SKIP_ARGS package com.google.cloud.tools:jib-maven-plugin:build -Djib.to.tags=latest,$image_version

.github/workflows/performance-test.yml

@@ -84,7 +84,7 @@ jobs:
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
         env:
           MAVEN_OPTS: "-Dmaven.repo.local=/home/lenni/.m2/repository/"
-        run: mvn -DskipTests --batch-mode install -P prettierSkip
+        run: mvn -DskipTests --batch-mode install -P formattingSkip
 
       - name: Build graph
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'

doc/dev/decisionrecords/Codestyle.md

@@ -23,19 +23,25 @@ test, package, and install phases. So formatting will happen for example when yo
 % mvn test
 ```
 
-You can manually run _only_ the formatting process with:
+You can manually run _only_ the rewrite formatting process with:
+
+```shell
+% mvn rewrite:run
+```
+
+You can manually run _only_ the prettier formatting process with:
 
 ```shell
 % mvn prettier:write
 ```
 
-To skip the Prettier formating, use the profile `prettierSkip`:
+To skip the Prettier and rewrite formating, use the profile `formattingSkip`:
 
 ```shell
-% mvn test -P prettierSkip
+% mvn test -P formattingSkip
 ```
 
-To check for formatting errors, use the profile `prettierCheck`:
+To check for prettier formatting errors, use the profile `prettierCheck`:
 
 ```shell
 % mvn test -P prettierCheck

pom.xml

@@ -87,6 +87,7 @@
         <plugin.prettier.version>0.22</plugin.prettier.version>
         <plugin.prettier.goal>write</plugin.prettier.goal>
         <plugin.prettier.skip>false</plugin.prettier.skip>
+        <plugin.rewrite.skip>false</plugin.rewrite.skip>
         <skip-source-and-javadoc>true</skip-source-and-javadoc>
         <tests.excludedGroups>integration</tests.excludedGroups>
         <tests.includedGroups></tests.includedGroups>
@@ -300,6 +301,7 @@
                     <runPerSubmodule>true</runPerSubmodule>
                     <sizeThresholdMb>0</sizeThresholdMb>
                     <configLocation>${maven.multiModuleProjectDirectory}/openrewrite.yml</configLocation>
+                    <rewriteSkip>${plugin.rewrite.skip}</rewriteSkip>
                 </configuration>
                 <dependencies>
                     <dependency>
@@ -530,7 +532,7 @@
             </properties>
         </profile>
         <profile>
-            <id>prettierSkip</id>
+            <id>formattingSkip</id>
             <activation>
                 <property>
                     <!--
@@ -544,6 +546,7 @@
             </activation>
             <properties>
                 <plugin.prettier.skip>true</plugin.prettier.skip>
+                <plugin.rewrite.skip>true</plugin.rewrite.skip>
             </properties>
         </profile>
         <profile>
@@ -598,6 +601,7 @@
                 <tests.includedGroups>integration</tests.includedGroups>
                 <tests.excludedGroups></tests.excludedGroups>
                 <plugin.prettier.skip>true</plugin.prettier.skip>
+                <plugin.rewrite.skip>true</plugin.rewrite.skip>
             </properties>
         </profile>
 

script/custom-release.py

@@ -775,7 +775,7 @@ def read_ser_ver_id_from_pom_file(git_hash):
 
 def run_maven_test():
     if section_w_resume('run_maven_test', 'Run unit tests'):
-        mvn('clean', '-PprettierSkip', 'test')
+        mvn('clean', '-PformattingSkip', 'test')
 
 
 # Get the full git hash for a qualified branch name, tag or hash