Fixed bad merge at 2c5733111b2c60b2e17d7ccd1fd83fff727335d4 Somehow, the "windows" profile wasn't removed in that conflict. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/54ed33df Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/54ed33df Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/54ed33df Branch: refs/heads/TINKERPOP-1404 Commit: 54ed33df5e1cdd6be77bdb67d759ccba26222843 Parents: 4293eb3 Author: Stephen Mallette <[email protected]> Authored: Mon Sep 19 10:55:08 2016 -0400 Committer: Stephen Mallette <[email protected]> Committed: Mon Sep 19 10:55:08 2016 -0400 ---------------------------------------------------------------------- pom.xml | 42 ------------------------------------------ 1 file changed, 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/54ed33df/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7a4c230..020084b 100644 --- a/pom.xml +++ b/pom.xml @@ -1159,47 +1159,5 @@ limitations under the License. </build> </profile> - <profile> - <id>windows</id> - <activation> - <activeByDefault>false</activeByDefault> - <os> - <family>windows</family> - </os> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>download-hadoop-winutils</id> - <phase>generate-test-resources</phase> - <goals> - <goal>download-single</goal> - </goals> - <configuration> - <url>http://public-repo-1.hortonworks.com/</url> - <fromFile>hdp-win-alpha/winutils.exe</fromFile> - <toDir>${project.build.directory}/hadoop_home/bin</toDir> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Dlog4j.configuration=${log4j-test.properties} - -Dbuild.dir=${project.build.directory} - -Dhadoop.home.dir=${project.build.directory}/hadoop_home -Dis.testing=true - </argLine> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project>
