You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/08 15:19:03 UTC
[49/50] incubator-ignite git commit: # ignite-648: move tools.jar
profiles to parent pom
# ignite-648: move tools.jar profiles to parent pom
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9192535
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9192535
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9192535
Branch: refs/heads/ignite-648-failover
Commit: f9192535716710e6d72ec9d1ff4e1e93eec82c8d
Parents: 139016d
Author: ashutak <as...@gridgain.com>
Authored: Wed Jul 8 16:07:10 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Wed Jul 8 16:07:10 2015 +0300
----------------------------------------------------------------------
modules/aop/pom.xml | 44 +-------------------------------------------
modules/core/pom.xml | 40 ----------------------------------------
parent/pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++
pom.xml | 40 ----------------------------------------
4 files changed, 41 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9192535/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 0e023c1..29c3c2e 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -92,49 +92,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>tools.jar-default</id>
-
- <activation>
- <file>
- <exists>${java.home}/../lib/tools.jar</exists>
- </file>
- </activation>
-
- <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>
-
- <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>
-
+
<build>
<testResources>
<testResource>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9192535/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index b500d45..5ac49ae 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -429,45 +429,5 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>tools.jar-default</id>
-
- <activation>
- <file>
- <exists>${java.home}/../lib/tools.jar</exists>
- </file>
- </activation>
-
- <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>
-
- <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>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9192535/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bfa9f62..dbaa330 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -720,5 +720,45 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>tools.jar-default</id>
+
+ <activation>
+ <file>
+ <exists>${java.home}/../lib/tools.jar</exists>
+ </file>
+ </activation>
+
+ <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>
+
+ <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>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9192535/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5849d96..9d1b7d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -733,46 +733,6 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>tools.jar-default</id>
-
- <activation>
- <file>
- <exists>${java.home}/../lib/tools.jar</exists>
- </file>
- </activation>
-
- <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>
-
- <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>
<build>