Skip to content

Commit

Permalink
Merge pull request #184 from stevenbower/master
Browse files Browse the repository at this point in the history
provide information about the build back to maven, fixes Issue #181
  • Loading branch information
tcurdt committed Feb 15, 2015
2 parents e8d7407 + cf388cd commit de30000
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions src/main/java/org/vafer/jdeb/maven/DebMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.vafer.jdeb.maven;

import static org.vafer.jdeb.utils.Utils.lookupIfEmpty;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
Expand Down Expand Up @@ -43,6 +45,7 @@
import org.apache.maven.settings.Profile;
import org.apache.maven.settings.Settings;
import org.apache.tools.tar.TarEntry;
import org.codehaus.plexus.util.StringUtils;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
import org.vafer.jdeb.Console;
Expand All @@ -55,8 +58,6 @@
import org.vafer.jdeb.utils.Utils;
import org.vafer.jdeb.utils.VariableResolver;

import static org.vafer.jdeb.utils.Utils.lookupIfEmpty;

/**
* Creates Debian package
*/
Expand Down Expand Up @@ -262,7 +263,7 @@ public class DebMojo extends AbstractMojo {

@Parameter(defaultValue = "false")
private boolean skipSubmodules;

/**
* @deprecated
*/
Expand Down Expand Up @@ -319,6 +320,9 @@ public class DebMojo extends AbstractMojo {
*/
@Parameter(defaultValue = "${settings}")
private Settings settings;

@Parameter(defaultValue = "")
private String propertyPrefix;

/* end of parameters */

Expand Down Expand Up @@ -561,6 +565,17 @@ public void produce( final DataConsumer receiver ) {
getLog().error("Failed to create debian package " + debFile, e);
throw new MojoExecutionException("Failed to create debian package " + debFile, e);
}

if (!StringUtils.isBlank(propertyPrefix)) {
project.getProperties().put(propertyPrefix+"version", getProjectVersion() );
project.getProperties().put(propertyPrefix+"deb", debFile.getAbsolutePath());
project.getProperties().put(propertyPrefix+"deb.name", debFile.getName());
project.getProperties().put(propertyPrefix+"changes", changesOutFile.getAbsolutePath());
project.getProperties().put(propertyPrefix+"changes.name", changesOutFile.getName());
project.getProperties().put(propertyPrefix+"changes.txt", changesSaveFile.getAbsolutePath());
project.getProperties().put(propertyPrefix+"changes.txt.name", changesSaveFile.getName());
}

}

/**
Expand Down

0 comments on commit de30000

Please sign in to comment.