[Git][java-team/maven-debian-helper][master] 2 commits: Fixed the maven-ant-helper build to properly process the plugin annotations

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-debian-helper


Commits:
7a25ee44 by Emmanuel Bourg at 2018-06-28T15:09:55+02:00
Fixed the maven-ant-helper build to properly process the plugin annotations

- - - - -
0deb86c2 by Emmanuel Bourg at 2018-06-28T15:12:31+02:00
Upload to unstable

- - - - -


3 changed files:

- build.xml
- debian/changelog
- debian/rules


Changes:

=====================================
build.xml
=====================================
--- a/build.xml
+++ b/build.xml
@@ -33,7 +33,7 @@
           <ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
             <property name="debian.dir" location="debian" />
             <property name="project.dir" value="@{dir}" />
-            <property name="maven.generate.target" value="plugin:descriptor" />
+            <property name="maven.process-classes.target" value="plugin:descriptor" />
             <property name="keep-cleaned-pom" value="true" />
             <property name="use-local-repo" value="true" />
           </ant>


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-maven-debian-helper (2.3~exp2) UNRELEASED; urgency=medium
+maven-debian-helper (2.3) unstable; urgency=medium
 
   * Team upload.
   * No longer support generating CDBS based packages
-  * No longer ignore the JavaBeans Activation Framework dependencies (removed from Java 9)
+  * No longer ignore the JavaBeans Activation Framework dependencies
+    (removed from Java 9)
   * Add the DH parameter --buildsystem=maven when a build.xml file is present
     (Closes: #902587)
   * Support GitHub endpoints using the git at github.com:group/name.git format
@@ -17,7 +18,7 @@ maven-debian-helper (2.3~exp2) UNRELEASED; urgency=medium
   * No longer generate the get-orig-source target in debian/rules
   * Use salsa.debian.org Vcs-* URLs
 
- -- Emmanuel Bourg <ebourg at apache.org>  Tue, 27 Mar 2018 11:46:29 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 28 Jun 2018 15:10:29 +0200
 
 maven-debian-helper (2.3~exp1) unstable; urgency=medium
 


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ export CLASSPATH=/usr/share/java/commons-io.jar\
                 :/usr/share/java/maven-embedder-3.x.jar\
                 :/usr/share/java/maven-model-3.x.jar\
                 :/usr/share/java/maven-plugin-api-3.x.jar\
+                :/usr/share/java/maven-plugin-annotations.jar\
                 :/usr/share/java/maven-resolver-api.jar\
                 :/usr/share/java/maven-resolver-util.jar\
                 :/usr/share/java/maven-repo-helper.jar\



View it on GitLab: https://salsa.debian.org/java-team/maven-debian-helper/compare/200093e2384264c1b1a821e49b8e49a69e059660...0deb86c2eb53219e89e98a3ee3090fb49bb3cb8f

-- 
View it on GitLab: https://salsa.debian.org/java-team/maven-debian-helper/compare/200093e2384264c1b1a821e49b8e49a69e059660...0deb86c2eb53219e89e98a3ee3090fb49bb3cb8f
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/20180628/288bdcc9/attachment.html>