Skip to content
This repository has been archived by the owner on Jan 14, 2019. It is now read-only.

Fix windows issues #666

Merged
merged 1 commit into from
Sep 8, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix windows issues
  • Loading branch information
baev committed Sep 7, 2015
commit 02409d3f16aa8adcfb5b3ad7249536a0b9b2a161
4 changes: 2 additions & 2 deletions allure-commandline/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.9</version>
<version>2.0.0</version>
<configuration>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<goals>
<goal>exec:exec</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:exec</goal>
</goals>
<streamLogs>true</streamLogs>
<preBuildHookScript>setup</preBuildHookScript>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<executable>${allure.home}/bin/allure.bat</executable>
Expand Down
1 change: 1 addition & 0 deletions allure-commandline/src/it/generate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<executable>${allure.home}/bin/allure.bat</executable>
Expand Down
1 change: 1 addition & 0 deletions allure-commandline/src/it/help/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<executable>${allure.home}/bin/allure.bat</executable>
Expand Down
1 change: 1 addition & 0 deletions allure-commandline/src/it/version/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<executable>${allure.home}/bin/allure.bat</executable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ protected void validateResultsDirectories() throws AllureCommandException {
/**
* Format the classpath string from given classpath elements.
*/
protected String formatClassPath(Path first, Path... others) {
String result = first.toString();
for (Path other : others) {
protected String formatClassPath(String first, String... others) {
String result = first;
for (String other : others) {
result += PROPERTIES.getPathSeparator() + other;
}
return result;
Expand All @@ -85,27 +85,28 @@ private CommandLine createCommandLine() throws AllureCommandException {
/**
* Returns the bundle jar classpath element.
*/
protected Path getBundleJarPath() throws AllureCommandException {
protected String getBundleJarPath() throws AllureCommandException {
Path path = PROPERTIES.getAllureHome().resolve("app/allure-bundle.jar").toAbsolutePath();

if (Files.notExists(path)) {
throw new AllureCommandException(COMMAND_REPORT_GENERATE_BUNDLE_MISSING, path);
}
return path;
return path.toString();
}

/**
* Returns the config directory classpath element.
*/
protected Path getConfigPath() {
return PROPERTIES.getAllureConfig().toAbsolutePath().getParent();
protected String getConfigPath() {
return PROPERTIES.getAllureConfig().toAbsolutePath().getParent().toString();
}

/**
* Returns the plugins directory classpath element.
*/
protected Path getPluginsPath() {
return PROPERTIES.getAllureHome().resolve("plugins/*").toAbsolutePath();
protected String getPluginsPath() {
Path path = PROPERTIES.getAllureHome().resolve("plugins").toAbsolutePath();
return String.format("%s/*", path);
}

/**
Expand Down