Merge branch '1.2.x'

This commit is contained in:
Stephane Nicoll 2015-05-26 16:21:23 +02:00
commit 4ec519fd08

View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -214,7 +214,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
classifier = "-" + classifier;
}
return new File(this.outputDirectory, this.finalName + classifier + "."
+ this.project.getPackaging());
+ this.project.getArtifact().getArtifactHandler().getExtension());
}
private LaunchScript getLaunchScript() throws IOException {