[Git][java-team/aspectj-maven-plugin][upstream] New upstream version 1.11

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / aspectj-maven-plugin


Commits:
8e629b98 by Emmanuel Bourg at 2018-10-04T22:07:10Z
New upstream version 1.11
- - - - -


3 changed files:

- .travis.yml
- pom.xml
- src/main/java/org/codehaus/mojo/aspectj/AjcHelper.java


Changes:

=====================================
.travis.yml
=====================================
@@ -1,6 +1,5 @@
 language: java
 jdk:
-  - oraclejdk7
   - oraclejdk8
 addons:
   apt:


=====================================
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,8 +100,11 @@ 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;
+                cp += File.pathSeparatorChar;                
+              }
             }
         }
         Iterator<String> outIter = outDirs.iterator();



View it on GitLab: https://salsa.debian.org/java-team/aspectj-maven-plugin/commit/8e629b98648253d843a7fd9b81c0a7fcb93195f7

-- 
View it on GitLab: https://salsa.debian.org/java-team/aspectj-maven-plugin/commit/8e629b98648253d843a7fd9b81c0a7fcb93195f7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181004/32478475/attachment.html>