[SCM] UNNAMED PROJECT branch, master, updated. debian/1.6.2-9-g859934e

Emmanuel Bourg ebourg at apache.org
Tue Jun 11 11:21:09 UTC 2013


The following commit has been merged in the master branch:
commit 360d522eab07c2ef751d3801884e9735111abd47
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jun 11 12:10:21 2013 +0200

    Improved code formatting

diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
index a53aaa1..5ff4b29 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
@@ -48,57 +48,76 @@ public class DependenciesMojo extends AbstractMojo {
      * @required
      */
     protected MavenProject project;
+    
     /**
      * A list of every project in this reactor; provided by Maven
+     * 
      * @parameter expression="${project.collectedProjects}"
      */
     protected List<MavenProject> collectedProjects;
+    
     /**
      * Location of the file.
+     * 
      * @parameter expression="${debian.directory}"
      *   default-value="debian"
      */
     protected File outputDirectory;
+    
     /**
      * Name of the package (e.g. 'commons-lang')
+     * 
      * @parameter expression="${package}"
      * @required
      */
     protected String packageName;
+    
     /**
      * Type of the package (e.g. 'maven' or 'ant')
+     * 
      * @parameter expression="${packageType}" default-value="maven"
      */
     protected String packageType;
+    
     /**
      * Should we also resolve Javadoc dependencies
+     * 
      * @parameter expression="${resolveJavadoc}" default-value="false"
      */
     protected boolean resolveJavadoc;
+    
     /**
      * Location for the list of POMs file.
+     * 
      * @required
      * @parameter expression="debian/${package}.poms"
      */
     protected File listOfPoms;
+    
     /**
      * Location of the Maven repository
      *
      * @parameter expression="${maven.repo.local}" default-value="/usr/share/maven-repo"
      */
     protected File mavenRepo;
+    
     /**
      * Interactive execution will ask questions to the user
+     * 
      * @parameter expression="${interactive}" default-value="true"
      */
     protected boolean interactive;
+    
     /**
      * Offline prevents any download from Internet
+     * 
      * @parameter expression="${offline}" default-value="false"
      */
     protected boolean offline;
+    
     /**
      * Try to be verbose
+     * 
      * @parameter expression="${verbose}" default-value="false"
      */
     protected boolean verbose;
diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
index 13603af..05174ce 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
@@ -52,71 +52,93 @@ public class GenerateDebianFilesMojo extends AbstractMojo {
      * @required
      */
     protected MavenProject project;
+    
     /**
      * A list of every project in this reactor; provided by Maven
+     * 
      * @parameter expression="${project.collectedProjects}"
      */
     protected List<MavenProject> collectedProjects;
+    
     /**
      * @parameter expression="${localRepository}"
      * @required
      * @readonly
      */
     protected ArtifactRepository localRepository;
+    
     /**
      * Location of the file.
+     * 
      * @parameter expression="${debian.directory}"
      *   default-value="debian"
      */
     protected File outputDirectory;
+    
     /**
      * Name of the packager (e.g. 'Ludovic Claude')
+     * 
      * @parameter expression="${packager}"
      * @required
      */
     protected String packager;
+    
     /**
      * Email of the packager (e.g. 'ludovic.claude at laposte.net')
+     * 
      * @parameter expression="${email}"
      * @required
      */
     protected String email;
+    
     /**
      * License used by the packager (e.g. 'GPL-3' or 'Apache-2.0')
      * See http://dep.debian.net/deps/dep5/ for the list of licenses.
+     * 
      * @parameter expression="${packagerLicense}" default-value="GPL-3"
      * @required
      */
     protected String packagerLicense;
+    
     /**
      * Name of the source package (e.g. 'commons-lang')
+     * 
      * @parameter expression="${package}"
      * @required
      */
     protected String packageName;
+    
     /**
      * Name of the binary package (e.g. 'libcommons-lang-java')
+     * 
      * @parameter expression="${bin.package}"
      * @required
      */
     protected String binPackageName;
+    
     /**
      * Type of the package (e.g. 'maven' or 'ant')
+     * 
      * @parameter expression="${packageType}" default-value="maven"
      */
     protected String packageType;
+    
     /**
      * URL for downloading the source code, in the form scm:[svn|cvs]:http://xxx/
      * for downloads using a source code repository,
      * or http://xxx.[tar|zip|gz|tgz] for downloads using source tarballs.
+     * 
      * @parameter expression="${downloadUrl}"
      */
     protected String downloadUrl;
+    
     /**
      * If true, include running the tests during the build.
+     * 
      * @parameter expression="${runTests}" default-value="false"
      */
     protected boolean runTests;
+    
     /**
      * If true, generate the Javadoc packaged in a separate package.
      * @parameter expression="${generateJavadoc}" default-value="false"
@@ -127,8 +149,7 @@ public class GenerateDebianFilesMojo extends AbstractMojo {
     private LicensesScanner licensesScanner = new LicensesScanner();
     private UserInteraction userInteraction = new UserInteraction();
 
-    public void execute()
-            throws MojoExecutionException {
+    public void execute() throws MojoExecutionException {
         File f = outputDirectory;
         if (!f.exists()) {
             f.mkdirs();

-- 
UNNAMED PROJECT



More information about the pkg-java-commits mailing list