[SCM] UNNAMED PROJECT branch, master, updated. debian/1.6.2-4-g0a4b256
Emmanuel Bourg
ebourg at apache.org
Tue Jun 11 08:25:12 UTC 2013
The following commit has been merged in the master branch:
commit 852dfa99b4b68a67a82a3da6ec6d358e6ced192a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jun 11 10:24:17 2013 +0200
Fixed the indentation in several classes of the debian-maven-plugin
diff --git a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java
index 1310a4a..5853ee3 100644
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java
@@ -21,45 +21,42 @@ import java.io.File;
/**
* Install the javadoc jar files into the debian/ directory
*
- * @goal install-doc
- *
* @author Ludovic Claude
+ * @goal install-doc
*/
-public class InstallDocMojo extends SysInstallDocMojo
-{
+public class InstallDocMojo extends SysInstallDocMojo {
/**
- * Maven repository root
- *
- * @parameter expression="${maven.repo.local}"
- */
+ * Maven repository root
+ *
+ * @parameter expression="${maven.repo.local}"
+ */
private File mavenRepoLocal;
- /**
- * If true, use local Maven repository for installation
- *
- * @parameter expression="${use.maven.repo.local}"
- */
- private boolean useMavenRepoLocal;
-
- // ----------------------------------------------------------------------
- // Public methods
- // ----------------------------------------------------------------------
+ /**
+ * If true, use local Maven repository for installation
+ *
+ * @parameter expression="${use.maven.repo.local}"
+ */
+ private boolean useMavenRepoLocal;
- // ----------------------------------------------------------------------
- // Private methods
- // ----------------------------------------------------------------------
+ // ----------------------------------------------------------------------
+ // Public methods
+ // ----------------------------------------------------------------------
- /* returns e.g. $CURDIR/debian/libfoobar-java
- */
+ // ----------------------------------------------------------------------
+ // Private methods
+ // ----------------------------------------------------------------------
- protected String packagePath()
- {
- if (useMavenRepoLocal) {
- return mavenRepoLocal.getAbsolutePath();
- } else {
- return getDebianDir() + "/" + getDestPackage();
- }
- }
+ /**
+ * Returns e.g. $CURDIR/debian/libfoobar-java
+ */
+ protected String packagePath() {
+ if (useMavenRepoLocal) {
+ return mavenRepoLocal.getAbsolutePath();
+ } else {
+ return getDebianDir() + "/" + getDestPackage();
+ }
+ }
}
diff --git a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveNoneMojo.java b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveNoneMojo.java
index 70d7020..1772b16 100644
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveNoneMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/ResolveNoneMojo.java
@@ -25,9 +25,8 @@ import org.apache.maven.plugin.MojoExecutionException;
* @goal resolve-none
* @aggregator true
*/
-public class ResolveNoneMojo extends AbstractMojo
-{
- public void execute() throws MojoExecutionException
- {
- }
+public class ResolveNoneMojo extends AbstractMojo {
+
+ public void execute() throws MojoExecutionException {
+ }
}
diff --git a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysUninstallMojo.java b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysUninstallMojo.java
index 1a78f42..e083ea3 100644
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysUninstallMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysUninstallMojo.java
@@ -17,6 +17,7 @@ package org.debian.maven.plugin;
*/
import java.io.IOException;
+
import org.codehaus.plexus.util.FileUtils;
/**
@@ -24,23 +25,21 @@ import org.codehaus.plexus.util.FileUtils;
*
* @goal sysuninstall
*/
-public class SysUninstallMojo extends SysInstallMojo
-{
- // ----------------------------------------------------------------------
- // Mojo parameters
- // ----------------------------------------------------------------------
+public class SysUninstallMojo extends SysInstallMojo {
+ // ----------------------------------------------------------------------
+ // Mojo parameters
+ // ----------------------------------------------------------------------
- // ----------------------------------------------------------------------
- // Public methods
- // ----------------------------------------------------------------------
+ // ----------------------------------------------------------------------
+ // Public methods
+ // ----------------------------------------------------------------------
- // ----------------------------------------------------------------------
- // Private methods
- // ----------------------------------------------------------------------
+ // ----------------------------------------------------------------------
+ // Private methods
+ // ----------------------------------------------------------------------
- protected void runMojo() throws IOException
- {
- FileUtils.forceDelete(fullRepoPath());
- FileUtils.fileDelete(fullCompatPath());
- }
+ protected void runMojo() throws IOException {
+ FileUtils.forceDelete(fullRepoPath());
+ FileUtils.fileDelete(fullCompatPath());
+ }
}
--
UNNAMED PROJECT
More information about the pkg-java-commits
mailing list