This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 44ed99124 Switch back to fmt-maven-plugin
44ed99124 is described below
commit 44ed99124b4c1829440267a5b0ea7eb31f9c94f1
Author: Andreas Veithen <[email protected]>
AuthorDate: Sun May 1 17:27:33 2022 +0100
Switch back to fmt-maven-plugin
The plugin now works with recent Java versions.
---
axiom-weaver/pom.xml | 4 ++--
buildutils/pom.xml | 4 ++--
mixins/core-mixins/pom.xml | 4 ++--
mixins/om-mixins/pom.xml | 4 ++--
pom.xml | 15 +++++++++++----
5 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/axiom-weaver/pom.xml b/axiom-weaver/pom.xml
index b11d4bf9e..d698d0cc0 100644
--- a/axiom-weaver/pom.xml
+++ b/axiom-weaver/pom.xml
@@ -88,8 +88,8 @@
</executions>
</plugin>
<plugin>
- <groupId>com.github.veithen.maven</groupId>
- <artifactId>java-format-maven-plugin</artifactId>
+ <groupId>com.spotify.fmt</groupId>
+ <artifactId>fmt-maven-plugin</artifactId>
<executions>
<execution>
<goals>
diff --git a/buildutils/pom.xml b/buildutils/pom.xml
index 8d66efb13..a40374876 100644
--- a/buildutils/pom.xml
+++ b/buildutils/pom.xml
@@ -81,8 +81,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.github.veithen.maven</groupId>
- <artifactId>java-format-maven-plugin</artifactId>
+ <groupId>com.spotify.fmt</groupId>
+ <artifactId>fmt-maven-plugin</artifactId>
<executions>
<execution>
<goals>
diff --git a/mixins/core-mixins/pom.xml b/mixins/core-mixins/pom.xml
index 3d383a9f4..95eff8793 100644
--- a/mixins/core-mixins/pom.xml
+++ b/mixins/core-mixins/pom.xml
@@ -52,8 +52,8 @@
<build>
<plugins>
<plugin>
- <groupId>com.github.veithen.maven</groupId>
- <artifactId>java-format-maven-plugin</artifactId>
+ <groupId>com.spotify.fmt</groupId>
+ <artifactId>fmt-maven-plugin</artifactId>
<executions>
<execution>
<goals>
diff --git a/mixins/om-mixins/pom.xml b/mixins/om-mixins/pom.xml
index 5a7cfafe8..26c8f6c35 100644
--- a/mixins/om-mixins/pom.xml
+++ b/mixins/om-mixins/pom.xml
@@ -90,8 +90,8 @@
</executions>
</plugin>
<plugin>
- <groupId>com.github.veithen.maven</groupId>
- <artifactId>java-format-maven-plugin</artifactId>
+ <groupId>com.spotify.fmt</groupId>
+ <artifactId>fmt-maven-plugin</artifactId>
<executions>
<execution>
<goals>
diff --git a/pom.xml b/pom.xml
index b9c0d005a..c47c6e06a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -847,16 +847,23 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.github.veithen.maven</groupId>
- <artifactId>java-format-maven-plugin</artifactId>
- <version>0.2.0</version>
+ <groupId>com.spotify.fmt</groupId>
+ <artifactId>fmt-maven-plugin</artifactId>
+ <version>2.18</version>
<configuration>
<!-- AOSP changes the indentation (from 2 to 4) and
the import order. Since we
don't want Android conventions for import
ordering, we skip sorting
imports. -->
<style>aosp</style>
- <sortImports>false</sortImports>
+ <skipSortingImports>true</skipSortingImports>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.googlejavaformat</groupId>
+ <artifactId>google-java-format</artifactId>
+ <version>1.15.0</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
