ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject incubator-ignite git commit: # sprint-1 - Build fixes
Date Sat, 14 Feb 2015 19:57:40 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/sprint-1 3feb05f7f -> f846f8a0c


# sprint-1 - Build fixes


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

Branch: refs/heads/sprint-1
Commit: f846f8a0c00ce65258c4328f8f96f07cb182818b
Parents: 3feb05f
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Sat Feb 14 11:57:41 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Sat Feb 14 11:57:41 2015 -0800

----------------------------------------------------------------------
 assembly/core-jar.xml            | 67 -----------------------------------
 assembly/dependencies-fabric.xml | 42 ++++++++++++++++++----
 assembly/dependencies-hadoop.xml | 42 ++++++++++++++++++----
 pom.xml                          | 15 --------
 4 files changed, 70 insertions(+), 96 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f846f8a0/assembly/core-jar.xml
----------------------------------------------------------------------
diff --git a/assembly/core-jar.xml b/assembly/core-jar.xml
deleted file mode 100644
index 451f689..0000000
--- a/assembly/core-jar.xml
+++ /dev/null
@@ -1,67 +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>core-jar-with-dependencies</id>
-
-    <formats>
-        <format>dir</format>
-    </formats>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <moduleSets>
-        <moduleSet>
-            <includes>
-                <include>org.apache.ignite:ignite-core</include>
-            </includes>
-            <sources>
-                <includeModuleDirectory>false</includeModuleDirectory>
-                <fileSets>
-                    <fileSet>
-                        <directory>${basedir}</directory>
-                        <outputDirectory>/</outputDirectory>
-                        <includes>
-                            <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/f846f8a0/assembly/dependencies-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index ee13ace..19fd4c4 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -65,12 +65,40 @@
                 </fileSets>
             </sources>
         </moduleSet>
-    </moduleSets>
 
-    <fileSets>
-        <fileSet>
-            <directory>target/core</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
+        <moduleSet>
+            <includes>
+                <include>org.apache.ignite:ignite-core</include>
+            </includes>
+            <sources>
+                <includeModuleDirectory>false</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/f846f8a0/assembly/dependencies-hadoop.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-hadoop.xml b/assembly/dependencies-hadoop.xml
index 56136d8..ee49731 100644
--- a/assembly/dependencies-hadoop.xml
+++ b/assembly/dependencies-hadoop.xml
@@ -68,6 +68,41 @@
 
         <moduleSet>
             <includes>
+                <include>org.apache.ignite:ignite-core</include>
+            </includes>
+            <sources>
+                <includeModuleDirectory>false</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>
+
+        <moduleSet>
+            <includes>
                 <include>org.apache.ignite:ignite-hadoop</include>
             </includes>
             <sources>
@@ -111,11 +146,4 @@
             <outputDirectory>/licenses</outputDirectory>
         </fileSet>
     </fileSets>
-
-    <files>
-        <file>
-            <source>target/ignite-core-${ignite.version}.jar</source>
-            <outputDirectory>/</outputDirectory>
-        </file>
-    </files>
 </assembly>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f846f8a0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ec0cf61..9f2194b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,21 +393,6 @@
                 <inherited>false</inherited>
                 <executions>
                     <execution>
-                        <id>core-jar</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>${basedir}/assembly/core-jar.xml</descriptor>
-                            </descriptors>
-                            <finalName>core</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                        </configuration>
-                    </execution>
-
-                    <execution>
                         <id>dependencies</id>
                         <phase>prepare-package</phase>
                         <goals>


Mime
View raw message