.travis.yml

 language: java
 jdk:
-  - oraclejdk7
   - oraclejdk8
 addons:
   apt:

debian/changelog

+aspectj-maven-plugin (1.11-1) unstable; urgency=medium
+
+  * New upstream release
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 05 Oct 2018 00:09:58 +0200
+
 aspectj-maven-plugin (1.10-1) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -3,8 +3,10 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
-Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.2)
-Build-Depends-Indep: junit4,
+Build-Depends:
+ debhelper (>= 11),
+ default-jdk,
+ junit4,
  libaspectj-java (>= 1.8.2),
  libdoxia-sitetools-java,
  libmaven-invoker-plugin-java,
@@ -13,10 +15,11 @@ Build-Depends-Indep: junit4,
  libmaven-reporting-api-java,
  libmaven-reporting-impl-java,
  libmaven3-core-java,
-                     libplexus-utils2-java (>= 2.0.5)
-Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/aspectj-maven-plugin.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/aspectj-maven-plugin.git
+ libplexus-utils2-java (>= 2.0.5),
+ maven-debian-helper (>= 2.2)
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/aspectj-maven-plugin.git
+Vcs-Browser: https://salsa.debian.org/java-team/aspectj-maven-plugin
 Homepage: http://www.mojohaus.org/aspectj-maven-plugin/
 
 Package: libaspectj-maven-plugin-java

debian/rules

@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename --repack --compression xz

debian/watch

-version=3
+version=4
+opts="repack,compression=xz" \
 https://github.com/mojohaus/aspectj-maven-plugin/tags .*/aspectj-maven-plugin-([\d\.]+).tar.gz

pom.xml

@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>aspectj-maven-plugin</artifactId>
-  <version>1.10</version>
+  <version>1.11</version>
   <packaging>maven-plugin</packaging>
 
   <name>Mojo's AspectJ Maven Plugin</name>
@@ -20,10 +20,10 @@
   </description>
   <inceptionYear>2005</inceptionYear>
   <properties>
-    <aspectjVersion>1.8.9</aspectjVersion>
+    <aspectjVersion>1.8.13</aspectjVersion>
     <mavenVersion>3.0.5</mavenVersion>
     <doxiaVersion>1.6</doxiaVersion>
-    <mojo.java.target>1.7</mojo.java.target> <!-- aspectJ 1.8.7 is JDK 1.7 minimum -->
+    <mojo.java.target>1.8</mojo.java.target> <!-- aspectJ 1.8.13 is JDK 1.8 minimum -->
     <!-- work around until it is correctly fixed at top parent -->
     <scmpublish.content>${project.build.directory}/staging/aspectj-maven-plugin</scmpublish.content>
   </properties>
@@ -45,7 +45,7 @@
     <connection>scm:git:https://github.com/mojohaus/aspectj-maven-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/mojohaus/aspectj-maven-plugin.git</developerConnection>
     <url>https://github.com/mojohaus/aspectj-maven-plugin</url>
-    <tag>aspectj-maven-plugin-1.10</tag>
+    <tag>aspectj-maven-plugin-1.11</tag>
   </scm>
 
   <developers>
@@ -201,7 +201,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <!-- use parent's configuration -->
+        <version>3.5</version>
+        <configuration>
+          <!-- see: https://github.com/apache/maven-plugin-tools/pull/11 -->
+          <mojoDependencies>org.codehaus.mojo:aspectj-maven-plugin</mojoDependencies>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -307,6 +311,15 @@
 
   <reporting>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>3.5</version>
+        <configuration>
+          <!-- see: https://github.com/apache/maven-plugin-tools/pull/11 -->
+          <mojoDependencies>org.codehaus.mojo:aspectj-maven-plugin</mojoDependencies>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>l10n-maven-plugin</artifactId>

src/main/java/org/codehaus/mojo/aspectj/AjcHelper.java

@@ -100,10 +100,13 @@ public class AjcHelper
             File artifact = classPathElement.getFile();
             if ( null != artifact )
             {
+              String type = classPathElement.getType();
+              if (!type.equals("pom")){
                 cp += classPathElement.getFile().getAbsolutePath();
                 cp += File.pathSeparatorChar;                
               }
             }
+        }
         Iterator<String> outIter = outDirs.iterator();
         while ( outIter.hasNext() )
         {