You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2021/12/18 15:27:49 UTC
[ws-axiom] branch master updated: Fix build on Java 17
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 4b81045 Fix build on Java 17
4b81045 is described below
commit 4b810454677f33ff9e984c64923023162bff9223
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sat Dec 18 15:27:40 2021 +0000
Fix build on Java 17
---
.github/workflows/ci.yml | 9 +--------
axiom-weaver/pom.xml | 4 ++--
pom.xml | 15 ++++-----------
3 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d63c126..5dce1d9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,14 +21,7 @@ on:
branches: [ '*' ]
env:
- # --add-exports to work around https://github.com/coveooss/fmt-maven-plugin/issues/99
- MAVEN_OPTS: >-
- -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
- --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
- --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
- --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
- --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
- --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+ MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
jobs:
build:
diff --git a/axiom-weaver/pom.xml b/axiom-weaver/pom.xml
index 0fc5af5..d559e29 100644
--- a/axiom-weaver/pom.xml
+++ b/axiom-weaver/pom.xml
@@ -88,8 +88,8 @@
</executions>
</plugin>
<plugin>
- <groupId>com.coveo</groupId>
- <artifactId>fmt-maven-plugin</artifactId>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>java-format-maven-plugin</artifactId>
<executions>
<execution>
<goals>
diff --git a/pom.xml b/pom.xml
index 91ce58f..6e98a9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -841,23 +841,16 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.coveo</groupId>
- <artifactId>fmt-maven-plugin</artifactId>
- <version>2.13</version>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>java-format-maven-plugin</artifactId>
+ <version>0.1.0</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>
- <skipSortingImports>true</skipSortingImports>
+ <sortImports>false</sortImports>
</configuration>
- <dependencies>
- <dependency>
- <groupId>com.google.googlejavaformat</groupId>
- <artifactId>google-java-format</artifactId>
- <version>1.13.0</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>