Repository: incubator-ignite Updated Branches: refs/heads/ignite-648-failover 73c2137a8 -> 581b93f9d
# ignite-648: smart kill all (fix maven dependencies) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a755e985 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a755e985 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a755e985 Branch: refs/heads/ignite-648-failover Commit: a755e98518b6b57303e70546f59a3391da882bed Parents: 7c27a36 Author: ashutak <ashu...@gridgain.com> Authored: Mon Jun 29 17:14:26 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Mon Jun 29 17:14:26 2015 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a755e985/modules/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index b23d874..c9bb8e1 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -164,14 +164,6 @@ <version>2.4</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - <version>1.4.2</version> - <scope>system</scope> - <systemPath>${toolsjar}</systemPath> - </dependency> </dependencies> <build> @@ -440,26 +432,42 @@ <profile> <id>tools.jar-default</id> + <activation> <file> <exists>${java.home}/../lib/tools.jar</exists> </file> </activation> - <properties> - <toolsjar>${java.home}/../lib/tools.jar</toolsjar> - </properties> + + <dependencies> + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.4.2</version> + <scope>system</scope> + <systemPath>${java.home}/../lib/tools.jar</systemPath> + </dependency> + </dependencies> </profile> <profile> <id>tools.jar-mac</id> + <activation> <file> <exists>${java.home}/../Classes/classes.jar</exists> </file> </activation> - <properties> - <toolsjar>${java.home}/../Classes/classes.jar</toolsjar> - </properties> + + <dependencies> + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.4.2</version> + <scope>system</scope> + <systemPath>${java.home}/../Classes/classes.jar</systemPath> + </dependency> + </dependencies> </profile> </profiles> </project>
