ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [06/25] incubator-ignite git commit: # ignite-791 schema-import profile.
Date Thu, 30 Apr 2015 15:14:51 GMT
# ignite-791 schema-import profile.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60e240e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60e240e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60e240e9

Branch: refs/heads/ignite-732
Commit: 60e240e97ac57c9b11fa4a9affd574b2427af2ed
Parents: 0301207
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Apr 29 16:16:54 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Apr 29 16:16:54 2015 +0700

----------------------------------------------------------------------
 modules/schema-import/pom.xml |  6 +++--
 pom.xml                       | 52 ++++++++++++++++++++++++++++++++++----
 2 files changed, 51 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/60e240e9/modules/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 7c49cab..0684d11 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -84,9 +84,11 @@
 
     <profiles>
         <profile>
-            <id>jfxrt.jar</id>
+            <id>schema-import</id>
             <activation>
-                <jdk>[1.7,1.8)</jdk>
+                <file>
+                    <exists>${java.home}/lib/jfxrt.jar</exists>
+                </file>
             </activation>
             <dependencies>
                 <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/60e240e9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5c232de..b2cfa0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,7 @@
             <id>dev-libs</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
+                <jdk>[1.7,)</jdk>
             </activation>
             <build>
                 <plugins>
@@ -167,6 +168,7 @@
             <id>release</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
+                <jdk>[1.7,)</jdk>
             </activation>
             <build>
                 <plugins>
@@ -432,6 +434,7 @@
 
             <activation>
                 <activeByDefault>true</activeByDefault>
+                <jdk>[1.7,)</jdk>
             </activation>
 
             <modules>
@@ -550,13 +553,52 @@
         </profile>
 
         <profile>
+            <id>java8-schema-import</id>
+            <activation>
+                <file>
+                    <exists>${java.home}/lib/ext/jfxrt.jar</exists>
+                </file>
+            </activation>
+            <modules>
+                <module>modules/schema-import</module>
+            </modules>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.4</version>
+                        <inherited>false</inherited>
+
+                        <executions>
+                            <execution>
+                                <id>dependencies-schema-import</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>assembly/dependencies-schema-import.xml</descriptor>
+                                    </descriptors>
+                                    <outputDirectory>target/release-package/bin</outputDirectory>
+                                    <finalName>include</finalName>
+                                    <appendAssemblyId>false</appendAssemblyId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+
+        <profile>
             <id>schema-import</id>
             <activation>
-                <jdk>[1.8)</jdk>
-                <property>
-                    <name>java.vendor</name>
-                    <value>Oracle Corporation</value>
-                </property>
+                <file>
+                    <exists>${java.home}/lib/jfxrt.jar</exists>
+                </file>
             </activation>
             <modules>
                 <module>modules/schema-import</module>


Mime
View raw message