ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1863149 - /webservices/wss4j/branches/2_2_x-fixes/pom.xml
Date Tue, 16 Jul 2019 15:31:17 GMT
Author: coheigea
Date: Tue Jul 16 15:31:17 2019
New Revision: 1863149

URL: http://svn.apache.org/viewvc?rev=1863149&view=rev
Log:
WSS-633 - Upgrade ErrorProne to support Java 11

Modified:
    webservices/wss4j/branches/2_2_x-fixes/pom.xml

Modified: webservices/wss4j/branches/2_2_x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/pom.xml?rev=1863149&r1=1863148&r2=1863149&view=diff
==============================================================================
--- webservices/wss4j/branches/2_2_x-fixes/pom.xml (original)
+++ webservices/wss4j/branches/2_2_x-fixes/pom.xml Tue Jul 16 15:31:17 2019
@@ -238,24 +238,18 @@
                     <configuration>
                         <source>${targetJdk}</source>
                         <target>${targetJdk}</target>
-                        <compilerArgument>-Xlint:overrides</compilerArgument>
-                        <compilerId>javac-with-errorprone</compilerId>
-                        <forceJavacCompilerUse>true</forceJavacCompilerUse>
+                        <compilerArgs>
+                            <arg>-XDcompilePolicy=simple</arg>
+                            <arg>-Xplugin:ErrorProne</arg>
+                        </compilerArgs>
+                        <annotationProcessorPaths>
+                            <path>
+                                <groupId>com.google.errorprone</groupId>
+                                <artifactId>error_prone_core</artifactId>
+                                <version>2.3.2</version>
+                            </path>
+                        </annotationProcessorPaths>
                     </configuration>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.codehaus.plexus</groupId>
-                            <artifactId>plexus-compiler-javac-errorprone</artifactId>
-                            <version>2.8</version>
-                        </dependency>
-                        <!-- override plexus-compiler-javac-errorprone's dependency on
-                             Error Prone with the latest version -->
-                        <dependency>
-                            <groupId>com.google.errorprone</groupId>
-                            <artifactId>error_prone_core</artifactId>
-                            <version>2.1.1</version>
-                        </dependency>
-                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.rat</groupId>
@@ -374,6 +368,16 @@
                         </plugin>
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-compiler-plugin</artifactId>
+                            <configuration>
+                                <fork>true</fork>
+                                <compilerArgs combine.children="append">
+                                    <arg>-J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/9+181-r4173-1/javac-9+181-r4173-1.jar</arg>
+                                </compilerArgs>
+                            </configuration>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-surefire-plugin</artifactId>
                             <version>2.21.0</version>
                             <configuration>
@@ -412,7 +416,7 @@
                                 <includes>
                                     <include>**/*Test.java</include>
                                 </includes>
-                                <argLine>-Xmx2000m --add-modules java.xml.bind,java.xml.ws
--add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-exports=java.xml.ws/com.sun.xml.internal.messaging.saaj.soap.impl=ALL-UNNAMED
--add-exports=java.xml.ws/com.sun.xml.internal.messaging.saaj.soap=ALL-UNNAMED</argLine>
+                                <argLine>-Xmx2000m --add-opens java.base/java.lang.reflect=ALL-UNNAMED</argLine>
                                 <systemPropertyVariables>
                                     <java.io.tmpdir>${basedir}/target</java.io.tmpdir>
                                 </systemPropertyVariables>
@@ -421,6 +425,40 @@
                     </plugins>
                 </pluginManagement>
             </build>
+            <dependencies>
+                 <dependency>
+                     <groupId>javax.activation</groupId>
+                     <artifactId>activation</artifactId>
+                     <version>1.1.1</version>
+                 </dependency>
+                 <dependency>
+                     <groupId>javax.xml.bind</groupId>
+                     <artifactId>jaxb-api</artifactId>
+                     <version>2.2.11</version>
+                 </dependency>
+                 <dependency>
+                     <groupId>javax.xml.ws</groupId>
+                     <artifactId>jaxws-api</artifactId>
+                     <version>2.2.9</version>
+                 </dependency>
+                 <dependency>
+                     <groupId>com.sun.xml.bind</groupId>
+                     <artifactId>jaxb-impl</artifactId>
+                     <scope>test</scope>
+                     <version>2.2.11</version>
+                 </dependency>
+                 <dependency>
+                     <groupId>com.sun.xml.bind</groupId>
+                     <artifactId>jaxb-core</artifactId>
+                     <version>2.2.11</version>
+                 </dependency>
+                 <dependency>
+                     <groupId>com.sun.xml.messaging.saaj</groupId>
+                     <artifactId>saaj-impl</artifactId>
+                     <scope>test</scope>
+                     <version>1.4.0-b03</version>
+                </dependency>
+             </dependencies>
          </profile>
 
          <profile>



Mime
View raw message