ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [09/23] incubator-ignite git commit: gg-10074
Date Wed, 15 Apr 2015 09:28:47 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/57f2c8bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/57f2c8bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/57f2c8bc

Branch: refs/heads/ignite-sprint-4
Commit: 57f2c8bc0aa8efd2c45453f59286519a2d62e072
Parents: f0008ac
Author: Anton Vinogradov <avinogradov@gridgain.com>
Authored: Mon Apr 13 15:57:42 2015 +0300
Committer: Anton Vinogradov <avinogradov@gridgain.com>
Committed: Mon Apr 13 15:57:42 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt |  4 ++--
 pom.xml      | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57f2c8bc/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index 4df917c..1a6bd82 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -6,7 +6,7 @@ Without LGPL dependencies (default):
 With LGPL dependencies:
   mvn clean package -DskipTests -Prelease,lgpl
 
-Look for incubator-ignite-<version>-bin.zip in ./target directory.
+Look for incubator-ignite-<version>-bin.zip in ./target/bin directory.
 
 NOTE: JDK version should be 1.7.0-* or >= 1.8.0-u40.
 
@@ -17,7 +17,7 @@ mvn clean package -DskipTests -Dignite.edition=hadoop [-Dhadoop.version=X.X.X]
 
 Use 'hadoop.version' parameter to build Ignite against a specific Hadoop version.
 
-Look for incubator-ignite-<version>-bin.zip in ./target directory.
+Look for incubator-ignite-<version>-bin.zip in ./target/bin directory.
 
 NOTE: JDK version should be 1.7.0-* or >= 1.8.0-u40.
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57f2c8bc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 11455b7..7aac1dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
 
     <properties>
         <ignite.site>scp://localhost:/home</ignite.site>
+        <ignite.zip.pattern>ignite-${ignite.edition}-${project.version}-incubating</ignite.zip.pattern>
     </properties>
 
     <scm>
@@ -319,15 +320,15 @@
                                             <substitution expression="${project.version}"
/>
                                         </replaceregexp>
 
-                                        <zip destfile="${basedir}/target/ignite-${ignite.edition}-${project.version}-incubating.zip"
encoding="UTF-8">
-                                            <zipfileset dir="${basedir}/target/release-package"
prefix="ignite-${ignite.edition}-${project.version}-incubating" filemode="755">
+                                        <zip destfile="${basedir}/target/bin/${ignite.zip.pattern}.zip"
encoding="UTF-8">
+                                            <zipfileset dir="${basedir}/target/release-package"
prefix="${ignite.zip.pattern}" filemode="755">
                                                 <include name="**/*.sh" />
                                                 <include name="**/configure" />
                                                 <include name="**/install-sh" />
                                                 <include name="**/compile" />
                                                 <include name="**/missing" />
                                             </zipfileset>
-                                            <zipfileset dir="${basedir}/target/release-package"
prefix="ignite-${ignite.edition}-${project.version}-incubating">
+                                            <zipfileset dir="${basedir}/target/release-package"
prefix="${ignite.zip.pattern}">
                                                 <exclude name="**/*.sh" />
                                                 <exclude name="**/configure" />
                                                 <exclude name="**/install-sh" />
@@ -542,10 +543,11 @@
                                               tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.md5"
failonerror="false"/>
                                         <copy file="${basedir}/target/${project.artifactId}-${project.version}-source-release.zip.sha1"
                                               tofile="${basedir}/target/site/incubator-ignite-${project.version}-src.zip.sha1"
failonerror="false"/>
-                                        <copy file="${basedir}/target/ignite-fabric-${project.version}-incubating.zip"
-                                              toDir="${basedir}/target/site" failonerror="false"/>
-                                        <copy file="${basedir}/target/ignite-hadoop-${project.version}-incubating.zip"
-                                              toDir="${basedir}/target/site" failonerror="false"/>
+                                        <copy todir="${basedir}/target/site">
+                                            <fileset dir="${basedir}/target/bin">
+                                                <include name="**/*"/>
+                                            </fileset>
+                                        </copy>
                                         <copy file="${basedir}/KEYS" todir="${basedir}/target/site"
/>
                                     </target>
                                 </configuration>


Mime
View raw message