[Git][java-team/aspectj-maven-plugin][master] 7 commits: Wrap and sort
Emmanuel Bourg
gitlab at salsa.debian.org
Thu Oct 4 23:12:40 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / aspectj-maven-plugin
Commits:
bae20a47 by Emmanuel Bourg at 2017-09-06T12:33:05Z
Wrap and sort
- - - - -
8f4933cc by Emmanuel Bourg at 2018-10-04T22:05:40Z
Standards-Version updated to 4.2.1
- - - - -
636b4a4f by Emmanuel Bourg at 2018-10-04T22:06:07Z
Switch to debhelper level 11
- - - - -
c5000213 by Emmanuel Bourg at 2018-10-04T22:06:13Z
Use salsa.debian.org Vcs-* URLs
- - - - -
8e629b98 by Emmanuel Bourg at 2018-10-04T22:07:10Z
New upstream version 1.11
- - - - -
aaa351ba by Emmanuel Bourg at 2018-10-04T22:07:11Z
Update upstream source from tag 'upstream/1.11'
Update to upstream version '1.11'
with Debian dir 02024b1eea1fbc57557ee9f800a97dd56465ae15
- - - - -
c722d365 by Emmanuel Bourg at 2018-10-04T22:10:26Z
New upstream release (1.11)
- - - - -
8 changed files:
- .travis.yml
- debian/changelog
- debian/compat
- debian/control
- debian/rules
- debian/watch
- 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:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+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 at apache.org> Fri, 05 Oct 2018 00:09:58 +0200
+
aspectj-maven-plugin (1.10-1) unstable; urgency=medium
* Team upload.
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
@@ -3,20 +3,23 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.2)
-Build-Depends-Indep: junit4,
- libaspectj-java (>= 1.8.2),
- libdoxia-sitetools-java,
- libmaven-invoker-plugin-java,
- libmaven-plugin-testing-java,
- libmaven-plugin-tools-java,
- 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
+Build-Depends:
+ debhelper (>= 11),
+ default-jdk,
+ junit4,
+ libaspectj-java (>= 1.8.2),
+ libdoxia-sitetools-java,
+ libmaven-invoker-plugin-java,
+ libmaven-plugin-testing-java,
+ libmaven-plugin-tools-java,
+ libmaven-reporting-api-java,
+ libmaven-reporting-impl-java,
+ libmaven3-core-java,
+ 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
=====================================
@@ -1,2 +1,3 @@
-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,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/compare/a3336de3870a385ad57dfbda7deb927e555baba1...c722d365e1ad671df90ec6db2e7e8dbd04077bca
--
View it on GitLab: https://salsa.debian.org/java-team/aspectj-maven-plugin/compare/a3336de3870a385ad57dfbda7deb927e555baba1...c722d365e1ad671df90ec6db2e7e8dbd04077bca
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/d418d2e0/attachment.html>
More information about the pkg-java-commits
mailing list