This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new 5783927 JDK 11 compilation fixes
5783927 is described below
commit 5783927e1a8ef87516ce583904f19c5c2a953030
Author: robert lazarski <[email protected]>
AuthorDate: Fri Sep 11 12:14:30 2020 -1000
JDK 11 compilation fixes
---
modules/adb-codegen/pom.xml | 5 +++
modules/adb-tests/pom.xml | 46 ++++++++++++++++++++++++
modules/saaj/pom.xml | 1 +
modules/tool/axis2-xsd2java-maven-plugin/pom.xml | 2 +-
pom.xml | 3 +-
5 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/modules/adb-codegen/pom.xml b/modules/adb-codegen/pom.xml
index 6934e07..dede36d 100644
--- a/modules/adb-codegen/pom.xml
+++ b/modules/adb-codegen/pom.xml
@@ -64,6 +64,11 @@
<artifactId>xmlunit</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 aff3a73..3cb72dc 100644
--- a/modules/adb-tests/pom.xml
+++ b/modules/adb-tests/pom.xml
@@ -85,6 +85,33 @@
<type>mar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>${saaj.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>${saaj.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.googlejavaformat</groupId>
+ <artifactId>google-java-format</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ <version>${soap-api.version}</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>
@@ -199,6 +226,13 @@
</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>
@@ -345,6 +379,13 @@
<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>
@@ -524,6 +565,11 @@
<artifactId>saaj-api</artifactId>
<version>${saaj.api.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>1.2.0</version>
+ </dependency>
</dependencies>
</plugin>
<plugin>
diff --git a/modules/saaj/pom.xml b/modules/saaj/pom.xml
index bc7d48a..684bfa6 100644
--- a/modules/saaj/pom.xml
+++ b/modules/saaj/pom.xml
@@ -68,6 +68,7 @@
<dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>javax.xml.soap-api</artifactId>
+ <version>${soap-api.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
b/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
index 48fae64..7f5a9d1 100644
--- a/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
+++ b/modules/tool/axis2-xsd2java-maven-plugin/pom.xml
@@ -50,7 +50,7 @@
a version that works for both. -->
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0</version>
+ <version>20.0</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 615d740..5d67e74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -528,6 +528,7 @@
<httpcore.version>4.4.13</httpcore.version>
<httpclient.version>4.5.12</httpclient.version>
<intellij.version>5.0</intellij.version>
+ <soap-api.version>1.4.0</soap-api.version>
<jaxb.api.version>2.3.1</jaxb.api.version>
<jaxbri.version>2.3.3</jaxbri.version>
<jaxbcore.version>2.3.0.1</jaxbcore.version>
@@ -636,7 +637,7 @@
<dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>javax.xml.soap-api</artifactId>
- <version>1.3.8</version>
+ <version>${soap-api.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
