Update google-java-format
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 1f18250..051286d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -19,6 +19,9 @@
schedule:
interval: "daily"
ignore:
+ # 1.7 is the last version to support Java 8.
+ - dependency-name: "com.google.googlejavaformat:google-java-format"
+ versions: ">= 1.8"
- dependency-name: "com.sun.xml.messaging.saaj:saaj-impl"
versions: ">= 2.0"
- dependency-name: "com.sun.xml.ws:*"
diff --git a/modules/adb-codegen/pom.xml b/modules/adb-codegen/pom.xml
index 813cea9..d76a8f2 100644
--- a/modules/adb-codegen/pom.xml
+++ b/modules/adb-codegen/pom.xml
@@ -64,11 +64,6 @@
<artifactId>xmlunit-legacy</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.googlejavaformat</groupId>
- <artifactId>google-java-format</artifactId>
- <version>1.3</version>
- </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
diff --git a/modules/adb-tests/pom.xml b/modules/adb-tests/pom.xml
index b81b465..c9f1da2 100644
--- a/modules/adb-tests/pom.xml
+++ b/modules/adb-tests/pom.xml
@@ -85,18 +85,6 @@
<type>mar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.googlejavaformat</groupId>
- <artifactId>google-java-format</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <!-- Both google-java-format and Maven depend on Guava. We need to select
- a version that works for both. -->
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>20.0</version>
- </dependency>
</dependencies>
<build>
@@ -211,13 +199,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>com.google.googlejavaformat</groupId>
- <artifactId>google-java-format</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
@@ -364,13 +345,6 @@
<configuration>
<databindingName>adb</databindingName>
</configuration>
- <dependencies>
- <dependency>
- <groupId>com.google.googlejavaformat</groupId>
- <artifactId>google-java-format</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>${project.groupId}</groupId>
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 8c17a9f..3e9e199 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>com.google.googlejavaformat</groupId>
<artifactId>google-java-format</artifactId>
- <version>1.3</version>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml b/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
index ea45f4d..aafd80e 100644
--- a/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
+++ b/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
@@ -43,17 +43,6 @@
<url>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis2/java/core-staging/tools/maven-plugins/axis2-wsdl2code-maven-plugin</url>
</site>
</distributionManagement>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!-- Both google-java-format and Maven depend on Guava. We need to select
- a version that works for both. -->
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>19.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/modules/tool/axis2-xsd2java-maven-plugin/pom.xml b/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
index 7f5a9d1..23f8182 100644
--- a/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
+++ b/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
@@ -43,17 +43,6 @@
</site>
</distributionManagement>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!-- Both google-java-format and Maven depend on Guava. We need to select
- a version that works for both. -->
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>20.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/pom.xml b/pom.xml
index 6da6491..023ac4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1071,6 +1071,11 @@
<artifactId>org.osgi.framework</artifactId>
<version>1.10.0</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>30.1-jre</version>
+ </dependency>
<dependency>
<groupId>commons-cli</groupId>
