You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2019/07/16 15:33:55 UTC
svn commit: r1863153 -
/santuario/xml-security-java/branches/2.1.x-fixes/pom.xml
Author: coheigea
Date: Tue Jul 16 15:33:55 2019
New Revision: 1863153
URL: http://svn.apache.org/viewvc?rev=1863153&view=rev
Log:
Fixing build with JDK11
Modified:
santuario/xml-security-java/branches/2.1.x-fixes/pom.xml
Modified: santuario/xml-security-java/branches/2.1.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/pom.xml?rev=1863153&r1=1863152&r2=1863153&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/pom.xml (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/pom.xml Tue Jul 16 15:33:55 2019
@@ -157,23 +157,18 @@
<configuration>
<source>${targetJdk}</source>
<target>${targetJdk}</target>
- <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-SNAPSHOT</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>
@@ -403,6 +398,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>
@@ -441,8 +446,6 @@
<configuration>
<additionalJOptions>
<additionalJOption>-Xdoclint:none</additionalJOption>
- <additionalJOption>--add-modules</additionalJOption>
- <additionalJOption>java.xml.bind</additionalJOption>
</additionalJOptions>
</configuration>
</plugin>
@@ -461,7 +464,7 @@
<exclude>**/PerformanceMemoryTest.java</exclude>
<exclude>**/PerformanceTimingTest.java</exclude>
</excludes>
- <argLine>-Xmx2000m --add-modules java.xml.bind --add-opens java.base/java.lang.reflect=ALL-UNNAMED</argLine>
+ <argLine>-Xmx2000m --add-opens java.base/java.lang.reflect=ALL-UNNAMED</argLine>
<systemPropertyVariables>
<product.version>${project.version}</product.version>
<log4j.configuration>log4j-xmlsec.xml</log4j.configuration>
@@ -472,6 +475,30 @@
</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>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>
+ <scope>test</scope>
+ <version>2.2.11</version>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<!-- Profile for testing with EclipseLink MOXy based JAXB implementation -->
@@ -616,6 +643,21 @@
</dependency>
</dependencies>
+ <!-- Remove when we pick up errorpone 2.3.2 -->
+ <repositories>
+ <repository>
+ <id>Sonatype</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ <name>Sonatype Snapshot Repo</name>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<distributionManagement>
<repository>
<id>apache.releases.https</id>