ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [06/50] incubator-ignite git commit: gg-10074
Date Wed, 15 Apr 2015 14:36:15 GMT
gg-10074


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

Branch: refs/heads/ignite-446
Commit: 9aafda72d6bf8caba09cfd8b76cf7599645faff0
Parents: f57637a
Author: Anton Vinogradov <avinogradov@gridgain.com>
Authored: Mon Apr 13 19:06:34 2015 +0300
Committer: Anton Vinogradov <avinogradov@gridgain.com>
Committed: Mon Apr 13 19:06:34 2015 +0300

----------------------------------------------------------------------
 assembly/dependencies-fabric.xml          | 50 ++++++++++++++++
 assembly/dependencies-optional-fabric.xml | 82 -------------------------
 assembly/dependencies-optional-hadoop.xml | 83 --------------------------
 pom.xml                                   | 17 ------
 4 files changed, 50 insertions(+), 182 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9aafda72/assembly/dependencies-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index 50a77e7..a294243 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -100,5 +100,55 @@
                 </fileSets>
             </sources>
         </moduleSet>
+
+        <moduleSet>
+            <includeSubModules>true</includeSubModules>
+            <excludes>
+                <exclude>org.apache.ignite:ignite-core</exclude>
+                <exclude>org.apache.ignite:ignite-clients</exclude>
+                <exclude>org.apache.ignite:ignite-spring</exclude>
+                <exclude>org.apache.ignite:ignite-tools</exclude>
+                <exclude>org.apache.ignite:ignite-extdata-p2p</exclude>
+                <exclude>org.apache.ignite:ignite-extdata-uri</exclude>
+                <exclude>org.apache.ignite:ignite-examples</exclude>
+                <exclude>org.apache.ignite:ignite-indexing</exclude>
+                <exclude>org.apache.ignite:ignite-visor-console</exclude>
+                <exclude>org.apache.ignite:ignite-visor-plugins</exclude>
+                <exclude>org.apache.ignite:ignite-visor-trial</exclude>
+                <exclude>org.apache.ignite:ignite-hadoop</exclude>
+                <exclude>org.apache.ignite:ignite-schema-import</exclude>
+                <exclude>org.apache.ignite:ignite-codegen</exclude>
+            </excludes>
+            <sources>
+                <includeModuleDirectory>true</includeModuleDirectory>
+                <outputDirectoryMapping>optional/${module.artifactId}</outputDirectoryMapping>
+                <fileSets>
+                    <fileSet>
+                        <directory>${basedir}</directory>
+                        <outputDirectory>/</outputDirectory>
+                        <includes>
+                            <include>README.txt</include>
+                            <include>licenses/**</include>
+                        </includes>
+                    </fileSet>
+                    <fileSet>
+                        <directory>target/libs</directory>
+                        <outputDirectory>/</outputDirectory>
+                    </fileSet>
+                    <fileSet>
+                        <directory>target</directory>
+                        <outputDirectory>/</outputDirectory>
+                        <includes>
+                            <include>*.jar</include>
+                        </includes>
+                        <excludes>
+                            <exclude>*-tests.jar</exclude>
+                            <exclude>*-javadoc.jar</exclude>
+                            <exclude>*-sources.jar</exclude>
+                        </excludes>
+                    </fileSet>
+                </fileSets>
+            </sources>
+        </moduleSet>
     </moduleSets>
 </assembly>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9aafda72/assembly/dependencies-optional-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-optional-fabric.xml b/assembly/dependencies-optional-fabric.xml
deleted file mode 100644
index 4eba5af..0000000
--- a/assembly/dependencies-optional-fabric.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
-          http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>dependencies-optional</id>
-
-    <formats>
-        <format>dir</format>
-    </formats>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <moduleSets>
-        <moduleSet>
-            <includeSubModules>true</includeSubModules>
-            <excludes>
-                <exclude>org.apache.ignite:ignite-core</exclude>
-                <exclude>org.apache.ignite:ignite-clients</exclude>
-                <exclude>org.apache.ignite:ignite-spring</exclude>
-                <exclude>org.apache.ignite:ignite-tools</exclude>
-                <exclude>org.apache.ignite:ignite-extdata-p2p</exclude>
-                <exclude>org.apache.ignite:ignite-extdata-uri</exclude>
-                <exclude>org.apache.ignite:ignite-examples</exclude>
-                <exclude>org.apache.ignite:ignite-indexing</exclude>
-                <exclude>org.apache.ignite:ignite-visor-console</exclude>
-                <exclude>org.apache.ignite:ignite-visor-plugins</exclude>
-                <exclude>org.apache.ignite:ignite-visor-trial</exclude>
-                <exclude>org.apache.ignite:ignite-hadoop</exclude>
-                <exclude>org.apache.ignite:ignite-schema-import</exclude>
-                <exclude>org.apache.ignite:ignite-codegen</exclude>
-            </excludes>
-            <sources>
-                <includeModuleDirectory>true</includeModuleDirectory>
-                <fileSets>
-                    <fileSet>
-                        <directory>${basedir}</directory>
-                        <outputDirectory>/</outputDirectory>
-                        <includes>
-                            <include>README.txt</include>
-                            <include>licenses/**</include>
-                        </includes>
-                    </fileSet>
-                    <fileSet>
-                        <directory>target/libs</directory>
-                        <outputDirectory>/</outputDirectory>
-                    </fileSet>
-                    <fileSet>
-                        <directory>target</directory>
-                        <outputDirectory>/</outputDirectory>
-                        <includes>
-                            <include>*.jar</include>
-                        </includes>
-                        <excludes>
-                            <exclude>*-tests.jar</exclude>
-                            <exclude>*-javadoc.jar</exclude>
-                            <exclude>*-sources.jar</exclude>
-                        </excludes>
-                    </fileSet>
-                </fileSets>
-            </sources>
-        </moduleSet>
-    </moduleSets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9aafda72/assembly/dependencies-optional-hadoop.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-optional-hadoop.xml b/assembly/dependencies-optional-hadoop.xml
deleted file mode 100644
index e4e015d..0000000
--- a/assembly/dependencies-optional-hadoop.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
-          http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>dependencies-optional</id>
-
-    <formats>
-        <format>dir</format>
-    </formats>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <moduleSets>
-        <moduleSet>
-            <includeSubModules>true</includeSubModules>
-            <excludes>
-                <exclude>org.apache.ignite:ignite-core</exclude>
-                <exclude>org.apache.ignite:ignite-clients</exclude>
-                <exclude>org.apache.ignite:ignite-spring</exclude>
-                <exclude>org.apache.ignite:ignite-tools</exclude>
-                <exclude>org.apache.ignite:ignite-extdata-p2p</exclude>
-                <exclude>org.apache.ignite:ignite-extdata-uri</exclude>
-                <exclude>org.apache.ignite:ignite-examples</exclude>
-                <exclude>org.apache.ignite:ignite-hibernate</exclude>
-                <exclude>org.apache.ignite:ignite-indexing</exclude>
-                <exclude>org.apache.ignite:ignite-jta</exclude>
-                <exclude>org.apache.ignite:ignite-hadoop</exclude>
-                <exclude>org.apache.ignite:ignite-visor-console</exclude>
-                <exclude>org.apache.ignite:ignite-visor-plugins</exclude>
-                <exclude>org.apache.ignite:ignite-schema-import</exclude>
-                <exclude>org.apache.ignite:ignite-codegen</exclude>
-            </excludes>
-            <sources>
-                <includeModuleDirectory>true</includeModuleDirectory>
-                <fileSets>
-                    <fileSet>
-                        <directory>${basedir}</directory>
-                        <outputDirectory>/</outputDirectory>
-                        <includes>
-                            <include>README.txt</include>
-                            <include>licenses/**</include>
-                        </includes>
-                    </fileSet>
-                    <fileSet>
-                        <directory>target/libs</directory>
-                        <outputDirectory>/</outputDirectory>
-                    </fileSet>
-                    <fileSet>
-                        <directory>target</directory>
-                        <outputDirectory>/</outputDirectory>
-                        <includes>
-                            <include>*.jar</include>
-                        </includes>
-                        <excludes>
-                            <exclude>*-tests.jar</exclude>
-                            <exclude>*-javadoc.jar</exclude>
-                            <exclude>*-sources.jar</exclude>
-                        </excludes>
-                    </fileSet>
-                </fileSets>
-            </sources>
-        </moduleSet>
-    </moduleSets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9aafda72/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7aac1dd..f887532 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,23 +365,6 @@
                             </execution>
 
                             <execution>
-                                <id>dependencies-optional</id>
-                                <phase>prepare-package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>${basedir}/assembly/dependencies-optional-${ignite.edition}.xml
-                                        </descriptor>
-                                    </descriptors>
-                                    <outputDirectory>${basedir}/target/release-package/libs</outputDirectory>
-                                    <finalName>optional</finalName>
-                                    <appendAssemblyId>false</appendAssemblyId>
-                                </configuration>
-                            </execution>
-
-                            <execution>
                                 <id>release</id>
                                 <phase>prepare-package</phase>
                                 <goals>


Mime
View raw message