mirror of
https://github.com/querydsl/querydsl.git
synced 2026-06-16 21:01:10 +08:00
changed targetFolder type in GenericExporterMojo
This commit is contained in:
parent
8ec70a5d74
commit
233d5aba1b
@ -40,7 +40,7 @@ public abstract class AbstractExporterMojo extends AbstractMojo {
|
||||
/**
|
||||
* @parameter
|
||||
*/
|
||||
private String targetFolder;
|
||||
private File targetFolder;
|
||||
|
||||
/**
|
||||
* @parameter default-value=false
|
||||
@ -81,14 +81,7 @@ public abstract class AbstractExporterMojo extends AbstractMojo {
|
||||
|
||||
Charset charset = sourceEncoding != null ? Charset.forName(sourceEncoding) : Charset.defaultCharset();
|
||||
GenericExporter exporter = new GenericExporter(classLoader, charset);
|
||||
|
||||
// see http://maven.apache.org/plugin-developers/common-bugs.html#Resolving_Relative_Paths,
|
||||
// Consider changing targetFolder to type File instead
|
||||
File targetDir = new File(targetFolder);
|
||||
if(!targetDir.isAbsolute()) {
|
||||
targetDir = new File(project.getBasedir(), targetFolder);
|
||||
}
|
||||
exporter.setTargetFolder(targetDir);
|
||||
exporter.setTargetFolder(targetFolder);
|
||||
|
||||
if (scala) {
|
||||
try {
|
||||
|
||||
@ -19,7 +19,7 @@ public class GenericExporterMojoTest extends AbstractMojoTest {
|
||||
mavenProject.getBuild().setOutputDirectory("target/classes");
|
||||
|
||||
GenericExporterMojo mojo = new GenericExporterMojo();
|
||||
set(mojo, "targetFolder", "target/generated-test-data");
|
||||
set(mojo, "targetFolder", new File("target/generated-test-data"));
|
||||
set(mojo, "packages", new String[]{"com.mysema.query.maven"});
|
||||
set(mojo, "project", mavenProject);
|
||||
mojo.execute();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user