ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: IGNITE-1653
Date Wed, 21 Oct 2015 09:36:36 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1653 71d672019 -> 167f1e786


IGNITE-1653


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

Branch: refs/heads/ignite-1653
Commit: 167f1e78608724fbd6a27aee212b175fa178bb99
Parents: 71d6720
Author: Anton Vinogradov <av@apache.org>
Authored: Wed Oct 21 12:36:02 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Wed Oct 21 12:36:02 2015 +0300

----------------------------------------------------------------------
 assembly/release-fabric-base.xml | 116 ++++++++++++++++++++++++++++++++++
 assembly/release-fabric-lgpl.xml |   1 +
 assembly/release-fabric.xml      |  93 +--------------------------
 3 files changed, 118 insertions(+), 92 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/167f1e78/assembly/release-fabric-base.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml
new file mode 100644
index 0000000..45f1ec0
--- /dev/null
+++ b/assembly/release-fabric-base.xml
@@ -0,0 +1,116 @@
+<?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.
+  -->
+
+<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
+           http://maven.apache.org/xsd/component-1.1.2.xsd">
+    <files>
+        <file>
+            <source>assembly/LICENSE_FABRIC</source>
+            <destName>LICENSE</destName>
+            <outputDirectory>/</outputDirectory>
+        </file>
+
+        <file>
+            <source>assembly/NOTICE_FABRIC</source>
+            <destName>NOTICE</destName>
+            <outputDirectory>/</outputDirectory>
+        </file>
+
+        <file>
+            <source>examples/pom-standalone.xml</source>
+            <outputDirectory>/examples</outputDirectory>
+            <destName>pom.xml</destName>
+        </file>
+
+        <file>
+            <source>examples/schema-import/pom-standalone.xml</source>
+            <outputDirectory>/examples/schema-import</outputDirectory>
+            <destName>pom.xml</destName>
+        </file>
+    </files>
+
+    <fileSets>
+        <fileSet>
+            <directory>bin</directory>
+            <outputDirectory>/bin</outputDirectory>
+            <includes>
+                <include>igniterouter.bat</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>bin</directory>
+            <outputDirectory>/bin</outputDirectory>
+            <fileMode>0755</fileMode>
+            <includes>
+                <include>igniterouter.sh</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>config/router</directory>
+            <outputDirectory>/config/router</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>examples</directory>
+            <outputDirectory>/examples</outputDirectory>
+            <includes>
+                <include>rest/**</include>
+                <include>memcached/**</include>
+                <include>schema-import/src/**</include>
+                <include>schema-import/bin/**</include>
+                <include>schema-import/README.txt</include>
+                <include>README.txt</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>target/javadoc/core</directory>
+            <outputDirectory>/docs/javadoc</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>modules/scalar/target/site/scaladocs</directory>
+            <outputDirectory>/docs/scaladoc/scalar</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>examples</directory>
+            <outputDirectory>/examples</outputDirectory>
+            <includes>
+                <include>config/**</include>
+                <include>src/**</include>
+            </includes>
+            <excludes>
+                <exclude>**/package.html</exclude>
+                <exclude>src/test/**</exclude>
+                <exclude>hibernate/**</exclude>
+                <exclude>src/main/java-lgpl/**</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>assembly/libs</directory>
+            <outputDirectory>/libs</outputDirectory>
+        </fileSet>
+    </fileSets>
+</component>

http://git-wip-us.apache.org/repos/asf/ignite/blob/167f1e78/assembly/release-fabric-lgpl.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric-lgpl.xml b/assembly/release-fabric-lgpl.xml
index 7411b02..3d8d397 100644
--- a/assembly/release-fabric-lgpl.xml
+++ b/assembly/release-fabric-lgpl.xml
@@ -31,6 +31,7 @@
 
     <componentDescriptors>
         <componentDescriptor>release-fabric.xml</componentDescriptor>
+        <componentDescriptor>release-fabric-base.xml</componentDescriptor>
     </componentDescriptors>
 
     <fileSets>

http://git-wip-us.apache.org/repos/asf/ignite/blob/167f1e78/assembly/release-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index cde4526..403d3c9 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -31,98 +31,7 @@
 
     <componentDescriptors>
         <componentDescriptor>release-base.xml</componentDescriptor>
+        <componentDescriptor>release-fabric-base.xml</componentDescriptor>
     </componentDescriptors>
 
-    <files>
-        <file>
-            <source>assembly/LICENSE_FABRIC</source>
-            <destName>LICENSE</destName>
-            <outputDirectory>/</outputDirectory>
-        </file>
-
-        <file>
-            <source>assembly/NOTICE_FABRIC</source>
-            <destName>NOTICE</destName>
-            <outputDirectory>/</outputDirectory>
-        </file>
-
-        <file>
-            <source>examples/pom-standalone.xml</source>
-            <outputDirectory>/examples</outputDirectory>
-            <destName>pom.xml</destName>
-        </file>
-
-        <file>
-            <source>examples/schema-import/pom-standalone.xml</source>
-            <outputDirectory>/examples/schema-import</outputDirectory>
-            <destName>pom.xml</destName>
-        </file>
-    </files>
-
-    <fileSets>
-        <fileSet>
-            <directory>bin</directory>
-            <outputDirectory>/bin</outputDirectory>
-            <includes>
-                <include>igniterouter.bat</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>bin</directory>
-            <outputDirectory>/bin</outputDirectory>
-            <fileMode>0755</fileMode>
-            <includes>
-                <include>igniterouter.sh</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>config/router</directory>
-            <outputDirectory>/config/router</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>examples</directory>
-            <outputDirectory>/examples</outputDirectory>
-            <includes>
-                <include>rest/**</include>
-                <include>memcached/**</include>
-                <include>schema-import/src/**</include>
-                <include>schema-import/bin/**</include>
-                <include>schema-import/README.txt</include>
-                <include>README.txt</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/javadoc/core</directory>
-            <outputDirectory>/docs/javadoc</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>modules/scalar/target/site/scaladocs</directory>
-            <outputDirectory>/docs/scaladoc/scalar</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>examples</directory>
-            <outputDirectory>/examples</outputDirectory>
-            <includes>
-                <include>config/**</include>
-                <include>src/**</include>
-            </includes>
-            <excludes>
-                <exclude>**/package.html</exclude>
-                <exclude>src/test/**</exclude>
-                <exclude>hibernate/**</exclude>
-                <exclude>src/main/java-lgpl/**</exclude>
-            </excludes>
-        </fileSet>
-
-        <fileSet>
-            <directory>assembly/libs</directory>
-            <outputDirectory>/libs</outputDirectory>
-        </fileSet>
-    </fileSets>
 </assembly>


Mime
View raw message