[pkg-java] r13767 - in trunk/maven-debian-helper: bin debian maven-debian-plugin/src/main/java/org/debian/maven/plugin

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-06-08 18:46:46 +0000 (Wed, 08 Jun 2011)
New Revision: 13767

Modified:
   trunk/maven-debian-helper/bin/mh_resolve_dependencies
   trunk/maven-debian-helper/debian/changelog
   trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
Log:
* SysInstallMojo: Send "--keep-elements" flag to POMCleaner if its
  set in <pkg>.poms file. Thanks to James Page <james.page at canonical.com>.
  Closes: #613364
* mh_resolve_dependencies: Always launch Maven in offline mode
  with --offline option (as already done on mh_make). Closes: #629356

Modified: trunk/maven-debian-helper/bin/mh_resolve_dependencies
===================================================================
--- trunk/maven-debian-helper/bin/mh_resolve_dependencies	2011-06-07 22:52:16 UTC (rev 13766)
+++ trunk/maven-debian-helper/bin/mh_resolve_dependencies	2011-06-08 18:46:46 UTC (rev 13767)
@@ -66,6 +66,6 @@
     fi
 fi
 
-mvn org.debian.maven:maven-packager-utils:$MH_VERSION:dependencies -Dpackage="$PACKAGE" ${ANT:+-DpackageType=ant} -Dmaven.repo.local=/usr/share/maven-repo ${NON_INTERACTIVE:+-Dinteractive=false} ${OFFLINE:+-Doffline=true} ${VERBOSE:+-Dverbose=true}
+mvn org.debian.maven:maven-packager-utils:$MH_VERSION:dependencies -Dpackage="$PACKAGE" ${ANT:+-DpackageType=ant} -Dmaven.repo.local=/usr/share/maven-repo ${NON_INTERACTIVE:+-Dinteractive=false} ${OFFLINE:+-Doffline=true} ${VERBOSE:+-Dverbose=true} --offline
 
 perl -p -i -e 's/maven\./maven:/' debian/${PACKAGE}.substvars

Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog	2011-06-07 22:52:16 UTC (rev 13766)
+++ trunk/maven-debian-helper/debian/changelog	2011-06-08 18:46:46 UTC (rev 13767)
@@ -3,6 +3,11 @@
   * DependenciesSolver: Don't use Properties.store() method since
     it escape some chars (like " >\=") from variables.
     Replace it with simple FileWriter. Closes: #628272.
+  * SysInstallMojo: Send "--keep-elements" flag to POMCleaner if its
+    set in <pkg>.poms file. Thanks to James Page <james.page at canonical.com>.
+    Closes: #613364
+  * mh_resolve_dependencies: Always launch Maven in offline mode
+    with --offline option (as already done on mh_make). Closes: #629356
 
  -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 08 Jun 2011 00:51:52 +0200
 

Modified: trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
===================================================================
--- trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java	2011-06-07 22:52:16 UTC (rev 13766)
+++ trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java	2011-06-08 18:46:46 UTC (rev 13767)
@@ -469,6 +469,12 @@
         System.out.println("\t--no-parent");
     }
     
+    // add options --keep-elements option
+    if (pomOption != null && pomOption.getKeepElements() != null) {
+        params.add("--keep-elements=" + pomOption.getKeepElements());
+        System.out.println("\t--keep-elements=" + pomOption.getKeepElements());
+    }
+    
     params.add(pomFile.getAbsolutePath());
     params.add(cleanedPomSrcPath());
     params.add(cleanedPomPropertiesSrcPath());