ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [07/10] ignite git commit: GG-11423 Build release artifacts once and use them for all editions
Date Thu, 25 May 2017 13:28:29 GMT
GG-11423 Build release artifacts once and use them for all editions


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

Branch: refs/heads/ignite-5232
Commit: cfe1e511a36f6f07ec7635a5dcbe31aef0c637e3
Parents: b051163
Author: oleg-ostanin <oostanin@gridgain.com>
Authored: Wed May 17 16:24:58 2017 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Wed May 17 16:39:05 2017 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |  74 ++++--
 assembly/dependencies-fabric-lgpl.xml           |   2 +
 assembly/dependencies-fabric.xml                |   2 +
 assembly/release-fabric-lgpl.xml                |   1 +
 assembly/release-fabric.xml                     |   1 +
 assembly/release-yardstick.xml                  |  98 +++++++
 .../Apache.Ignite.Core.nuspec                   |   5 +-
 modules/platforms/dotnet/build.ps1              |   5 +-
 modules/web-console/web-agent/pom.xml           |   8 +
 parent/pom.xml                                  |   8 +-
 pom.xml                                         | 257 ++++++-------------
 11 files changed, 246 insertions(+), 215 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe1e511/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index d3c162e..8a689b8 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -1,36 +1,63 @@
 Ignite Fabric Maven Build Instructions
 ======================================
-Without LGPL dependencies (default):
-  mvn clean package -DskipTests
+1) Optional: build Apache Ignite.NET as described at modules/platforms/dotnet/DEVNOTES.txt.
 
-Without LGPL dependencies and Scala 2.10:
-  mvn clean package -DskipTests -Dscala-2.10
+2) Compile and package:
 
-With LGPL dependencies:
-  mvn clean package -DskipTests -Prelease,lgpl -Dignite.edition=fabric-lgpl
+  mvn clean package -Pall-java,all-scala,licenses -DskipTests
 
-With LGPL dependencies and Scala 2.10:
-  mvn clean package -DskipTests -Prelease,lgpl -Dignite.edition=fabric-lgpl -Dscala-2.10
+  or if you have built Apache Ignite.NET on the first step use following command:
+  (Note that 'doxygen' should be installed before running this command.)
 
-With LGPL dependencies and Scala 2.10 and Ignite-Yardstick:
-  mvn clean package -DskipTests -Prelease,lgpl,yardstick -Dignite.edition=fabric-lgpl -Dscala-2.10
+  mvn clean package -Pall-java,all-scala,licenses -DskipTests -DclientDocs
 
-With Apache Ignite.NET:
-  Build Apache Ignite.NET as described at modules/platforms/dotnet/DEVNOTES.txt.
+3) Javadoc generation (optional):
 
-  Then build Ignite Fabric with Apache Ignite.NET:
-  mvn clean package -DskipTests -DclientDocs
+  mvn initialize -Pjavadoc
 
-  Note that 'doxygen' should be installed before running this command.
+4) Assembly Apache Ignite fabric:
+
+  mvn initialize -Prelease
 
 Look for apache-ignite-fabric-<version>-bin.zip in ./target/bin directory.
 
+Ignite Fabric with LGPL Maven Build Instructions
+======================================
+1) Optional: build Apache Ignite.NET as described at modules/platforms/dotnet/DEVNOTES.txt.
+
+2) Compile and package:
+
+  mvn clean package -Pall-java,all-scala,licenses -DskipTests
+
+  or if you have built Apache Ignite.NET on the first step use following command:
+  (Note that 'doxygen' should be installed before running this command.)
+
+  mvn clean package -Pall-java,all-scala,licenses -DskipTests -DclientDocs
+
+3) Javadoc generation with LGPL (optional):
+
+  mvn initialize -Pjavadoc,lgpl
+
+4) Assembly Apache Ignite fabric with LGPL dependencies:
+
+  mvn initialize -Prelease,lgpl -Dignite.edition=fabric-lgpl
+
+Look for apache-ignite-fabric-lgpl-<version>-bin.zip in ./target/bin directory.
+
 Ignite Hadoop Accelerator Maven Build Instructions
 ============================================
-mvn clean package -DskipTests -Dignite.edition=hadoop [-Dhadoop.version=X.X.X] [-Dspark.version=x.y.z]
+1) Compile and package:
+
+    mvn clean package -Pall-java,all-scala,licenses -DskipTests
 
 Use 'hadoop.version' parameter to build Ignite against a specific Hadoop version.
 Use 'spark.version' parameter to build ignite-spark module for a specific Spark version. Version should be >= 2.0.0.
+For example:
+
+    mvn clean package -Pall-java,all-scala,licenses -DskipTests -Dhadoop.version=2.4.2 -Dspark.version=2.1.1
+
+2) Assembly Hadoop Accelerator:
+  mvn initialize -Prelease -Dignite.edition=hadoop
 
 Look for apache-ignite-hadoop-<version>-bin.zip in ./target/bin directory. Resulting binary
 assembly will also include integration module for Apache Spark.
@@ -66,12 +93,17 @@ Maven release plugin release:prepare goal can be used to make release tag.
 
 Deploy Ignite release candidate to maven repository and dev-svn, make tag:
 
-   Following command deploys Ignite to maven repository, prepares sources and fabric edition binaries.
-      mvn deploy -P apache-release,gpg,release,scala,lgpl,deploy-ignite-site -Dignite.edition=fabric -DskipTests -B
+   1) Deploy Ignite to maven repository, prepares sources and fabric edition binaries.
+      mvn deploy -Papache-release,gpg,all-java,all-scala,licenses,deploy-ignite-site -Dignite.edition=fabric -DskipTests
+
+   2) Javadoc generation:
+      mvn initialize -Pjavadoc
+
+   3) Assembly Apache Ignite Fabric:
+      mvn initialize -Prelease
 
-   In case you want to release both fabric and hadoop editions you have to build hadoop edition first using command
-      mvn package -P apache-release,gpg,release,scala,lgpl -Dignite.edition=hadoop -DskipTests -B
-   save /target/bin/*.zip, make "mvn clean" and restore saved files before deploying fabric.
+   4) Assembly Hadoop Accelerator:
+      mvn initialize -Prelease -Dignite.edition=hadoop
 
    Binary artifact name can be changed by setting additional property -Dignite.zip.pattern. Binary artifact will be
    created inside /target/bin folder when release profile is used.

http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe1e511/assembly/dependencies-fabric-lgpl.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-fabric-lgpl.xml b/assembly/dependencies-fabric-lgpl.xml
index 4cff146..e2fac3c 100644
--- a/assembly/dependencies-fabric-lgpl.xml
+++ b/assembly/dependencies-fabric-lgpl.xml
@@ -131,6 +131,8 @@
                 <exclude>org.apache.ignite:ignite-websphere-test</exclude>
                 <exclude>org.apache.ignite:ignite-cassandra</exclude>
                 <exclude>org.apache.ignite:ignite-yardstick</exclude>
+                <exclude>org.apache.ignite:ignite-benchmarks</exclude>
+                <exclude>org.apache.ignite:ignite-web-agent</exclude>
             </excludes>
             <sources>
                 <includeModuleDirectory>true</includeModuleDirectory>

http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe1e511/assembly/dependencies-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index be68d0a..6c4101e 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -136,6 +136,8 @@
                 <exclude>org.apache.ignite:ignite-websphere-test</exclude>
                 <exclude>org.apache.ignite:ignite-cassandra</exclude>
                 <exclude>org.apache.ignite:ignite-yardstick</exclude>
+                <exclude>org.apache.ignite:ignite-benchmarks</exclude>
+                <exclude>org.apache.ignite:ignite-web-agent</exclude>
             </excludes>
             <sources>
                 <includeModuleDirectory>true</includeModuleDirectory>

http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe1e511/assembly/release-fabric-lgpl.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric-lgpl.xml b/assembly/release-fabric-lgpl.xml
index 1766558..ff4d8c4 100644
--- a/assembly/release-fabric-lgpl.xml
+++ b/assembly/release-fabric-lgpl.xml
@@ -32,6 +32,7 @@
     <componentDescriptors>
         <componentDescriptor>release-base.xml</componentDescriptor>
         <componentDescriptor>release-fabric-base.xml</componentDescriptor>
+        <componentDescriptor>release-yardstick.xml</componentDescriptor>
     </componentDescriptors>
 
     <files>

http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe1e511/assembly/release-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index ffde8ec..7536d4e 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -32,6 +32,7 @@
     <componentDescriptors>
         <componentDescriptor>release-base.xml</componentDescriptor>
         <componentDescriptor>release-fabric-base.xml</componentDescriptor>
+        <componentDescriptor>release-yardstick.xml</componentDescriptor>
     </componentDescriptors>
 
     <files>

http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe1e511/assembly/release-yardstick.xml
----------------------------------------------------------------------
diff --git a/assembly/release-yardstick.xml b/assembly/release-yardstick.xml
new file mode 100644
index 0000000..0bd6f41
--- /dev/null
+++ b/assembly/release-yardstick.xml
@@ -0,0 +1,98 @@
+<?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>modules/yardstick/pom-standalone.xml</source>
+            <outputDirectory>benchmarks/sources</outputDirectory>
+            <destName>pom.xml</destName>
+        </file>
+
+        <file>
+            <source>modules/yardstick/DEVNOTES-standalone.txt</source>
+            <outputDirectory>benchmarks/sources</outputDirectory>
+            <destName>DEVNOTES.txt</destName>
+        </file>
+
+        <file>
+            <source>modules/yardstick/README.txt</source>
+            <outputDirectory>benchmarks</outputDirectory>
+            <destName>README.txt</destName>
+        </file>
+    </files>
+
+    <fileSets>
+        <fileSet>
+            <directory>modules/yardstick/target/assembly/bin</directory>
+            <outputDirectory>benchmarks/bin</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>modules/yardstick/target/assembly/config</directory>
+            <outputDirectory>benchmarks/config</outputDirectory>
+            <includes>
+                <include>benchmark.properties</include>
+                <include>benchmark-remote.properties</include>
+                <include>benchmark-sample.properties</include>
+                <include>benchmark-remote-sample.properties</include>
+                <include>benchmark-multicast.properties</include>
+                <include>ignite-base-config.xml</include>
+                <include>ignite-localhost-config.xml</include>
+                <include>ignite-remote-config.xml</include>
+                <include>ignite-multicast-config.xml</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>modules/yardstick/target/assembly/libs</directory>
+            <outputDirectory>benchmarks/libs</outputDirectory>
+            <excludes>
+                <exclude>junit-*.jar</exclude>
+                <exclude>ignite-apache-license-gen-*.jar</exclude>
+                <exclude>hamcrest-core-*.jar</exclude>
+                <exclude>tools-*.jar</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>modules/yardstick/src</directory>
+            <outputDirectory>benchmarks/sources/src</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>modules/yardstick/target/assembly/config</directory>
+            <outputDirectory>benchmarks/sources/config</outputDirectory>
+            <includes>
+                <include>benchmark.properties</include>
+                <include>benchmark-remote.properties</include>
+                <include>benchmark-sample.properties</include>
+                <include>benchmark-remote-sample.properties</include>
+                <include>benchmark-multicast.properties</include>
+                <include>ignite-base-config.xml</include>
+                <include>ignite-localhost-config.xml</include>
+                <include>ignite-remote-config.xml</include>
+                <include>ignite-multicast-config.xml</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</component>

http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe1e511/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec
index 8f562f1..09236ba 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec
@@ -61,10 +61,7 @@ More info: https://apacheignite-net.readme.io/
             Library files (jars) should not be included in project, so that NuGet package restore works properly.
             We keep jars in NuGet dir and copy them over in PostBuild event.
         -->
-        <file src="..\..\..\..\target\release-package\libs\*.jar" target="Libs" />
-        <file src="..\..\..\..\target\release-package\libs\ignite-spring\*.jar" target="Libs" />
-        <file src="..\..\..\..\target\release-package\libs\ignite-indexing\*.jar" target="Libs" />
-        <file src="..\..\..\..\target\release-package\libs\licenses\*.*" target="Licenses" />
+        <file src="..\bin\Libs\*.jar" target="Libs" />
     
         <!-- LINQPad samples -->
         <file src="NuGet\LINQPad\*.*" target="linqpad-samples" />

http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe1e511/modules/platforms/dotnet/build.ps1
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/build.ps1 b/modules/platforms/dotnet/build.ps1
index b8e6a37..222076a 100644
--- a/modules/platforms/dotnet/build.ps1
+++ b/modules/platforms/dotnet/build.ps1
@@ -112,10 +112,7 @@ if (!$skipJava) {
     $libsDir = "$PSScriptRoot\bin\Libs"
     mkdir -Force $libsDir; del -Force $libsDir\*.*
     
-    copy -Force target\release-package\libs\*.jar $libsDir
-    copy -Force target\release-package\libs\ignite-spring\*.jar $libsDir
-    copy -Force target\release-package\libs\ignite-indexing\*.jar $libsDir
-    copy -Force target\release-package\libs\licenses\*.jar $libsDir
+    ls modules\indexing\target,modules\core\target,modules\spring\target*.jar -recurse -include "ignite-core*","ignite-indexing*","ignite-shmem*","ignite-spring*","lucene*","h2*","cache-api*","commons-*","spring*" -exclude "*-sources*","*-javadoc*","*-tests*" | % { copy -Force $_ $libsDir }
 
     # Restore directory
     cd $PSScriptRoot

http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe1e511/modules/web-console/web-agent/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/pom.xml b/modules/web-console/web-agent/pom.xml
index 49e0ef0..168d150 100644
--- a/modules/web-console/web-agent/pom.xml
+++ b/modules/web-console/web-agent/pom.xml
@@ -183,6 +183,14 @@
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>

http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe1e511/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3b57895..110411b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -997,12 +997,8 @@
         </profile>
 
         <profile>
-            <id>release</id>
-            <activation>
-                <property>
-                    <name>!skipDefault</name><!--activeByDefault-->
-                </property>
-            </activation>
+            <id>licenses</id>
+
             <dependencies>
                 <dependency>
                     <groupId>org.apache.ignite</groupId>

http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe1e511/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8d388a5..db63291 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,29 +164,64 @@
         </profile>
 
         <profile>
-            <id>dev-libs</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>javadoc</id>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>core-javadoc</id>
+                                <goals>
+                                    <goal>aggregate</goal>
+                                </goals>
+                                <phase>validate</phase>
+                                <configuration>
+                                    <reportOutputDirectory>${basedir}/target/javadoc</reportOutputDirectory>
+                                    <destDir>core</destDir>
+                                    <stylesheetfile>${basedir}/assembly/docfiles/javadoc.css</stylesheetfile>
+                                    <subpackages>org.apache.ignite -exclude org.apache.ignite.client:org.apache.ignite.codegen:org.apache.ignite.examples:org.apache.ignite.internal:org.apache.ignite.schema:org.apache.ignite.tests:org.apache.ignite.tools:org.apache.ignite.util:org.apache.ignite.spi.discovery.tcp.messages:org.apache.ignite.spi.discovery.tcp.internal:org.apache.ignite.spi.deployment.uri.scanners:org.apache.ignite.spi.deployment.uri.tasks:org.apache.ignite.yardstick:org.apache.ignite.webtest</subpackages>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
                         <version>1.7</version>
                         <inherited>false</inherited>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.ignite</groupId>
+                                <artifactId>ignite-tools</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
                         <executions>
                             <execution>
-                                <id>dev-libs</id>
+                                <id>javadoc-postprocessing-new</id>
                                 <goals>
                                     <goal>run</goal>
                                 </goals>
-                                <phase>package</phase>
+                                <phase>initialize</phase>
                                 <configuration>
                                     <target>
-                                        <copy todir="${basedir}/libs">
-                                            <fileset dir="${basedir}/target/release-package/libs" />
+                                        <copy todir="${basedir}/target/javadoc/core">
+                                            <fileset dir="assembly/docfiles">
+                                                <include name="img/**" />
+                                                <include name="*.js" />
+                                            </fileset>
                                         </copy>
+
+                                            <taskdef name="doctask" classname="org.apache.ignite.tools.ant.beautifier.GridJavadocAntTask" />
+
+                                            <doctask css="dotted" dir="target/javadoc/core">
+                                                <include name="**/*.html" />
+                                                <exclude name="overview-frame.html" />
+                                                <exclude name="allclasses-frame.html" />
+                                                <exclude name="**/class-use/*" />
+                                            </doctask>
                                     </target>
                                 </configuration>
                             </execution>
@@ -208,11 +243,6 @@
 
         <profile>
             <id>release</id>
-            <activation>
-                <property>
-                    <name>!skipDefault</name><!--activeByDefault-->
-                </property>
-            </activation>
             <build>
                 <plugins>
                     <plugin><!-- skipping generation of dependencies licenses
@@ -235,26 +265,6 @@
 
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>core-javadoc</id>
-                                <goals>
-                                    <goal>aggregate</goal>
-                                </goals>
-                                <phase>process-test-classes</phase>
-                                <configuration>
-                                    <reportOutputDirectory>${basedir}/target/javadoc</reportOutputDirectory>
-                                    <destDir>core</destDir>
-                                    <stylesheetfile>${basedir}/assembly/docfiles/javadoc.css</stylesheetfile>
-                                    <subpackages>org.apache.ignite -exclude org.apache.ignite.client:org.apache.ignite.codegen:org.apache.ignite.examples:org.apache.ignite.internal:org.apache.ignite.schema:org.apache.ignite.tests:org.apache.ignite.tools:org.apache.ignite.util:org.apache.ignite.spi.discovery.tcp.messages:org.apache.ignite.spi.discovery.tcp.internal:org.apache.ignite.spi.deployment.uri.scanners:org.apache.ignite.spi.deployment.uri.tasks:org.apache.ignite.yardstick:org.apache.ignite.webtest</subpackages>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
                         <version>1.7</version>
                         <inherited>false</inherited>
@@ -267,44 +277,17 @@
                         </dependencies>
                         <executions>
                             <execution>
-                                <id>javadoc-postprocessing</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <phase>prepare-package</phase>
-                                <configuration>
-                                    <target>
-                                        <copy todir="${basedir}/target/javadoc/core">
-                                            <fileset dir="assembly/docfiles">
-                                                <include name="img/**" />
-                                                <include name="*.js" />
-                                            </fileset>
-                                        </copy>
-
-                                        <taskdef name="doctask" classname="org.apache.ignite.tools.ant.beautifier.GridJavadocAntTask" />
-
-                                        <doctask css="dotted" dir="target/javadoc/core">
-                                            <include name="**/*.html" />
-                                            <exclude name="overview-frame.html" />
-                                            <exclude name="allclasses-frame.html" />
-                                            <exclude name="**/class-use/*" />
-                                        </doctask>
-                                    </target>
-                                </configuration>
-                            </execution>
-
-                            <execution>
                                 <id>release-postprocessing</id>
                                 <goals>
                                     <goal>run</goal>
                                 </goals>
-                                <phase>package</phase>
+                                <phase>initialize</phase>
                                 <configuration>
                                     <target>
                                         <replaceregexp byline="true">
                                             <regexp pattern="pushd &quot;%~dp0&quot;/\.\./\.\.(\s*&amp;::.+)?" />
                                             <substitution expression="pushd &quot;%~dp0&quot;/.." />
-                                            <fileset dir="${basedir}/target/release-package/bin">
+                                            <fileset dir="${basedir}/target/release-package-${ignite.edition}/bin">
                                                 <include name="**/*.bat" />
                                             </fileset>
                                         </replaceregexp>
@@ -312,7 +295,7 @@
                                         <replaceregexp byline="true">
                                             <regexp pattern="IGNITE_HOME_TMP=&quot;\$\(dirname &quot;\$\{IGNITE_HOME_TMP\}&quot;\)&quot;(\s*#.*)?" />
                                             <substitution expression="" />
-                                            <fileset dir="${basedir}/target/release-package/bin">
+                                            <fileset dir="${basedir}/target/release-package-${ignite.edition}/bin">
                                                 <include name="**/*.sh" />
                                             </fileset>
                                         </replaceregexp>
@@ -320,7 +303,7 @@
                                         <replaceregexp byline="true">
                                             <regexp pattern="set SCRIPTS_HOME=%IGNITE_HOME%\\bin(\s*&amp;::.*)?" />
                                             <substitution expression="set SCRIPTS_HOME=%IGNITE_HOME%\\\\bin" />
-                                            <fileset dir="${basedir}/target/release-package/bin">
+                                            <fileset dir="${basedir}/target/release-package-${ignite.edition}/bin">
                                                 <include name="**/*.bat" />
                                             </fileset>
                                         </replaceregexp>
@@ -328,7 +311,7 @@
                                         <replaceregexp byline="true">
                                             <regexp pattern="SCRIPTS_HOME=&quot;\$\{IGNITE_HOME_TMP\}/bin&quot;(\s*#.*)?" />
                                             <substitution expression="SCRIPTS_HOME=&quot;$${IGNITE_HOME_TMP}/bin&quot;" />
-                                            <fileset dir="${basedir}/target/release-package/bin">
+                                            <fileset dir="${basedir}/target/release-package-${ignite.edition}/bin">
                                                 <include name="**/*.sh" />
                                             </fileset>
                                         </replaceregexp>
@@ -336,7 +319,7 @@
                                         <replaceregexp byline="true">
                                             <regexp pattern="\. &quot;\$\{SCRIPTS_HOME\}&quot;/include/build-classpath.sh(\s*#.*)?" />
                                             <substitution expression="" />
-                                            <fileset dir="${basedir}/target/release-package/bin">
+                                            <fileset dir="${basedir}/target/release-package-${ignite.edition}/bin">
                                                 <include name="**/*.sh" />
                                             </fileset>
                                         </replaceregexp>
@@ -344,7 +327,7 @@
                                         <replaceregexp byline="true">
                                             <regexp pattern="call &quot;%SCRIPTS_HOME%\\include\\build-classpath.bat&quot;(\s*&amp;::.*)?" />
                                             <substitution expression="" />
-                                            <fileset dir="${basedir}/target/release-package/bin">
+                                            <fileset dir="${basedir}/target/release-package-${ignite.edition}/bin">
                                                 <include name="**/*.bat" />
                                             </fileset>
                                         </replaceregexp>
@@ -352,7 +335,7 @@
                                         <replaceregexp byline="true">
                                             <regexp pattern="ENABLE_ASSERTIONS=.*" />
                                             <substitution expression="ENABLE_ASSERTIONS=&quot;0&quot;" />
-                                            <fileset dir="${basedir}/target/release-package/bin">
+                                            <fileset dir="${basedir}/target/release-package-${ignite.edition}/bin">
                                                 <include name="**/*.sh" />
                                             </fileset>
                                         </replaceregexp>
@@ -360,7 +343,7 @@
                                         <replaceregexp byline="true">
                                             <regexp pattern="ENABLE_ASSERTIONS=.*" />
                                             <substitution expression="ENABLE_ASSERTIONS=0" />
-                                            <fileset dir="${basedir}/target/release-package/bin">
+                                            <fileset dir="${basedir}/target/release-package-${ignite.edition}/bin">
                                                 <include name="**/*.bat" />
                                             </fileset>
                                         </replaceregexp>
@@ -368,36 +351,41 @@
                                         <replaceregexp byline="true">
                                             <regexp pattern="-DIGNITE_UPDATE_NOTIFIER=false" />
                                             <substitution expression="" />
-                                            <fileset dir="${basedir}/target/release-package/bin">
+                                            <fileset dir="${basedir}/target/release-package-${ignite.edition}/bin">
                                                 <include name="**/*.sh" />
                                                 <include name="**/*.bat" />
                                             </fileset>
                                         </replaceregexp>
 
-                                        <replaceregexp file="${basedir}/target/release-package/examples/pom.xml" byline="true">
+                                        <replaceregexp file="${basedir}/target/release-package-${ignite.edition}/examples/pom.xml" byline="true">
+                                            <regexp pattern="to_be_replaced_by_ignite_version" />
+                                            <substitution expression="${project.version}" />
+                                        </replaceregexp>
+
+                                        <replaceregexp file="${basedir}/target/release-package-${ignite.edition}/benchmarks/sources/pom.xml" byline="true">
                                             <regexp pattern="to_be_replaced_by_ignite_version" />
                                             <substitution expression="${project.version}" />
                                         </replaceregexp>
 
-                                        <chmod dir="${basedir}/target/release-package" perm="755" includes="**/*.sh" />
+                                        <chmod dir="${basedir}/target/release-package-${ignite.edition}" perm="755" includes="**/*.sh" />
 
                                         <!--
                                         Line ending bugfix for builds packaged in MS Windows machine to adjust Linux based
                                         end-of-line characters for Linux shell scripts
                                         -->
-                                        <fixcrlf srcdir="${basedir}/target/release-package" eol="lf" eof="remove">
+                                        <fixcrlf srcdir="${basedir}/target/release-package-${ignite.edition}" eol="lf" eof="remove">
                                             <include name="**/*.sh" />
                                         </fixcrlf>
 
                                         <zip destfile="${basedir}/target/bin/${ignite.zip.pattern}.zip" encoding="UTF-8">
-                                            <zipfileset dir="${basedir}/target/release-package" prefix="${ignite.zip.pattern}" filemode="755">
+                                            <zipfileset dir="${basedir}/target/release-package-${ignite.edition}" 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.zip.pattern}">
+                                            <zipfileset dir="${basedir}/target/release-package-${ignite.edition}" prefix="${ignite.zip.pattern}">
                                                 <exclude name="**/*.sh" />
                                                 <exclude name="**/configure" />
                                                 <exclude name="**/install-sh" />
@@ -418,8 +406,8 @@
                         <inherited>false</inherited>
                         <executions>
                             <execution>
-                                <id>dependencies</id>
-                                <phase>prepare-package</phase>
+                                <id>ignite-dependencies</id>
+                                <phase>validate</phase>
                                 <goals>
                                     <goal>single</goal>
                                 </goals>
@@ -427,15 +415,15 @@
                                     <descriptors>
                                         <descriptor>${basedir}/assembly/dependencies-${ignite.edition}.xml</descriptor>
                                     </descriptors>
-                                    <outputDirectory>${basedir}/target/release-package</outputDirectory>
+                                    <outputDirectory>${basedir}/target/release-package-${ignite.edition}</outputDirectory>
                                     <finalName>libs</finalName>
                                     <appendAssemblyId>false</appendAssemblyId>
                                 </configuration>
                             </execution>
 
                             <execution>
-                                <id>release</id>
-                                <phase>prepare-package</phase>
+                                <id>ignite-release</id>
+                                <phase>validate</phase>
                                 <goals>
                                     <goal>single</goal>
                                 </goals>
@@ -443,14 +431,14 @@
                                     <descriptors>
                                         <descriptor>assembly/release-${ignite.edition}.xml</descriptor>
                                     </descriptors>
-                                    <finalName>release-package</finalName>
+                                    <finalName>release-package-${ignite.edition}</finalName>
                                     <appendAssemblyId>false</appendAssemblyId>
                                 </configuration>
                             </execution>
 
                             <execution>
                                 <id>dependencies-visor-console</id>
-                                <phase>prepare-package</phase>
+                                <phase>validate</phase>
                                 <goals>
                                     <goal>single</goal>
                                 </goals>
@@ -458,7 +446,7 @@
                                     <descriptors>
                                         <descriptor>assembly/dependencies-visor-console.xml</descriptor>
                                     </descriptors>
-                                    <outputDirectory>target/release-package/bin</outputDirectory>
+                                    <outputDirectory>target/release-package-${ignite.edition}/bin</outputDirectory>
                                     <finalName>include</finalName>
                                     <appendAssemblyId>false</appendAssemblyId>
                                 </configuration>
@@ -466,7 +454,7 @@
 
                             <execution>
                                 <id>scala-scripts</id>
-                                <phase>prepare-package</phase>
+                                <phase>validate</phase>
                                 <goals>
                                     <goal>single</goal>
                                 </goals>
@@ -474,7 +462,7 @@
                                     <descriptors>
                                         <descriptor>assembly/release-scala.xml</descriptor>
                                     </descriptors>
-                                    <outputDirectory>target/release-package</outputDirectory>
+                                    <outputDirectory>target/release-package-${ignite.edition}</outputDirectory>
                                     <finalName>bin</finalName>
                                     <appendAssemblyId>false</appendAssemblyId>
                                 </configuration>
@@ -498,97 +486,6 @@
             <modules>
                 <module>modules/yardstick</module>
             </modules>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.7</version>
-                        <inherited>false</inherited>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.ignite</groupId>
-                                <artifactId>ignite-tools</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>release-yardstick</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <phase>prepare-package</phase>
-                                <configuration>
-                                    <target>
-                                        <mkdir dir="${basedir}/target/release-package/benchmarks" />
-
-                                        <copy todir="${basedir}/target/release-package/benchmarks/">
-                                            <fileset dir="${basedir}/modules/yardstick/target/assembly/" />
-                                        </copy>
-
-                                        <!--todo: only required jars should be exported to /benchmarks/libs during compilation-->
-                                        <delete>
-                                            <fileset dir="${basedir}/target/release-package/benchmarks/libs/">
-                                                <include name="junit-*.jar" />
-                                                <include name="ignite-apache-license-gen-*.jar" />
-                                                <include name="hamcrest-core-*.jar" />
-                                                <include name="tools-*.jar" />
-                                            </fileset>
-                                        </delete>
-
-                                        <!--todo: config structure should be refactored to be the same at "sources" and "released sources"-->
-                                        <delete>
-                                            <fileset dir="${basedir}/target/release-package/benchmarks/config/">
-                                                <include name="*.*" />
-                                                <exclude name="benchmark.properties" />
-                                                <exclude name="benchmark-remote.properties" />
-                                                <exclude name="benchmark-sample.properties" />
-                                                <exclude name="benchmark-remote-sample.properties" />
-                                                <exclude name="benchmark-multicast.properties" />
-                                                <exclude name="ignite-base-config.xml" />
-                                                <exclude name="ignite-localhost-config.xml" />
-                                                <exclude name="ignite-remote-config.xml" />
-                                                <exclude name="ignite-multicast-config.xml" />
-                                            </fileset>
-                                        </delete>
-
-                                        <mkdir dir="${basedir}/target/release-package/benchmarks/sources/src" />
-
-                                        <copy todir="${basedir}/target/release-package/benchmarks/sources/src/">
-                                            <fileset dir="${basedir}/modules/yardstick/src" />
-                                        </copy>
-
-                                        <mkdir dir="${basedir}/target/release-package/benchmarks/sources/config" />
-
-                                        <copy todir="${basedir}/target/release-package/benchmarks/sources/config/">
-                                            <fileset dir="${basedir}/target/release-package/benchmarks/config" />
-                                        </copy>
-
-                                        <copy file="${basedir}/modules/yardstick/pom-standalone.xml"
-                                              tofile="${basedir}/target/release-package/benchmarks/sources/pom.xml"/>
-
-                                        <replaceregexp byline="true">
-                                            <regexp pattern="to_be_replaced_by_ignite_version" />
-                                            <substitution expression="${project.version}" />
-                                            <fileset dir="${basedir}/target/release-package/benchmarks/sources/">
-                                                <include name="pom.xml" />
-                                            </fileset>
-                                        </replaceregexp>
-
-                                        <copy file="${basedir}/modules/yardstick/README.txt"
-                                              tofile="${basedir}/target/release-package/benchmarks/README.txt" overwrite="true">
-                                        </copy>
-
-                                        <copy file="${basedir}/modules/yardstick/DEVNOTES-standalone.txt"
-                                              tofile="${basedir}/target/release-package/benchmarks/sources/DEVNOTES.txt"/>
-                                    </target>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
 
         <profile>
@@ -661,7 +558,7 @@
                             </execution>
                             <execution>
                                 <id>source-release-assembly-ignite</id>
-                                <phase>package</phase>
+                                <phase>initialize</phase>
                                 <goals>
                                     <goal>single</goal>
                                 </goals>
@@ -684,7 +581,7 @@
                         <executions>
                             <execution>
                                 <id>attach-artifact</id><!-- allows to sign *bin.zip files -->
-                                <phase>package</phase>
+                                <phase>initialize</phase>
                                 <goals>
                                     <goal>run</goal>
                                 </goals>
@@ -747,7 +644,7 @@
                                 <goals>
                                     <goal>files</goal>
                                 </goals>
-                                <phase>install</phase>
+                                <phase>initialize</phase>
                             </execution>
                         </executions>
                         <configuration>
@@ -779,7 +676,7 @@
                                 <goals>
                                     <goal>run</goal>
                                 </goals>
-                                <phase>install</phase>
+                                <phase>initialize</phase>
                                 <configuration>
                                     <failOnError>false</failOnError>
                                     <target>


Mime
View raw message