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 2018/10/07 19:03:42 UTC

svn commit: r1843072 - /webservices/axiom/trunk/pom.xml

Author: veithen
Date: Sun Oct  7 19:03:42 2018
New Revision: 1843072

URL: http://svn.apache.org/viewvc?rev=1843072&view=rev
Log:
Fix AspectJ build problems on Java 9.

Modified:
    webservices/axiom/trunk/pom.xml

Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1843072&r1=1843071&r2=1843072&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sun Oct  7 19:03:42 2018
@@ -256,6 +256,7 @@
         <stax.impl.artifact>stax</stax.impl.artifact>
         <stax.impl.version>1.2.0</stax.impl.version>
         -->
+        <aspectj.version>1.9.1</aspectj.version>
         <shade.plugin.version>2.3</shade.plugin.version>
         <jacoco.version>0.8.0</jacoco.version>
         <spring.version>5.0.1.RELEASE</spring.version>
@@ -450,7 +451,7 @@
             <dependency>
                 <groupId>org.aspectj</groupId>
                 <artifactId>aspectjrt</artifactId>
-                <version>1.8.9</version>
+                <version>${aspectj.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.messaging.saaj</groupId>
@@ -718,10 +719,30 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>aspectj-maven-plugin</artifactId>
-                    <version>1.10</version>
+                    <version>1.11</version>
                     <configuration>
                         <complianceLevel>1.7</complianceLevel>
                     </configuration>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.aspectj</groupId>
+                            <artifactId>aspectjrt</artifactId>
+                            <version>${aspectj.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.aspectj</groupId>
+                            <artifactId>aspectjtools</artifactId>
+                            <version>${aspectj.version}</version>
+                        </dependency>
+                        <dependency>
+                            <!-- Dirty hack to work around Java 9 incompatibility in the plugin -->
+                            <groupId>com.sun</groupId>
+                            <artifactId>tools</artifactId>
+                            <version>${java.version}</version>
+                            <scope>system</scope>
+                            <systemPath>${project.basedir}/pom.xml</systemPath>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>