Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A173E200CA9 for ; Thu, 1 Jun 2017 17:32:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9FF56160BB5; Thu, 1 Jun 2017 15:32:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EDF1F160BDF for ; Thu, 1 Jun 2017 17:32:32 +0200 (CEST) Received: (qmail 93561 invoked by uid 500); 1 Jun 2017 15:32:27 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 92907 invoked by uid 99); 1 Jun 2017 15:32:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2017 15:32:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BBD3EDFF16; Thu, 1 Jun 2017 15:32:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 01 Jun 2017 15:32:41 -0000 Message-Id: <9722869e5d5d4c35a2bf4ceed9d07561@git.apache.org> In-Reply-To: <61283999f3e04d6db422b234b79bb492@git.apache.org> References: <61283999f3e04d6db422b234b79bb492@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/28] ignite git commit: IGNITE-5365 Build release artifacts once and use them for all editions archived-at: Thu, 01 Jun 2017 15:32:34 -0000 IGNITE-5365 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/54f499ce Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/54f499ce Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/54f499ce Branch: refs/heads/ignite-5075-pds Commit: 54f499cece98c9cade28f3e0a9cfe89323c64ef0 Parents: b04b580 Author: oleg-ostanin Authored: Wed May 31 20:02:00 2017 +0300 Committer: Anton Vinogradov Committed: Wed May 31 20:02:00 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 | 254 ++++++------------- 11 files changed, 246 insertions(+), 212 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/54f499ce/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--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--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--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/54f499ce/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 @@ org.apache.ignite:ignite-websphere-test org.apache.ignite:ignite-cassandra org.apache.ignite:ignite-yardstick + org.apache.ignite:ignite-benchmarks + org.apache.ignite:ignite-web-agent true http://git-wip-us.apache.org/repos/asf/ignite/blob/54f499ce/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 @@ org.apache.ignite:ignite-websphere-test org.apache.ignite:ignite-cassandra org.apache.ignite:ignite-yardstick + org.apache.ignite:ignite-benchmarks + org.apache.ignite:ignite-web-agent true http://git-wip-us.apache.org/repos/asf/ignite/blob/54f499ce/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 @@ release-base.xml release-fabric-base.xml + release-yardstick.xml http://git-wip-us.apache.org/repos/asf/ignite/blob/54f499ce/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 @@ release-base.xml release-fabric-base.xml + release-yardstick.xml http://git-wip-us.apache.org/repos/asf/ignite/blob/54f499ce/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 @@ + + + + + + + + modules/yardstick/pom-standalone.xml + benchmarks/sources + pom.xml + + + + modules/yardstick/DEVNOTES-standalone.txt + benchmarks/sources + DEVNOTES.txt + + + + modules/yardstick/README.txt + benchmarks + README.txt + + + + + + modules/yardstick/target/assembly/bin + benchmarks/bin + + + + modules/yardstick/target/assembly/config + benchmarks/config + + benchmark.properties + benchmark-remote.properties + benchmark-sample.properties + benchmark-remote-sample.properties + benchmark-multicast.properties + ignite-base-config.xml + ignite-localhost-config.xml + ignite-remote-config.xml + ignite-multicast-config.xml + + + + + modules/yardstick/target/assembly/libs + benchmarks/libs + + junit-*.jar + ignite-apache-license-gen-*.jar + hamcrest-core-*.jar + tools-*.jar + + + + + modules/yardstick/src + benchmarks/sources/src + + + + modules/yardstick/target/assembly/config + benchmarks/sources/config + + benchmark.properties + benchmark-remote.properties + benchmark-sample.properties + benchmark-remote-sample.properties + benchmark-multicast.properties + ignite-base-config.xml + ignite-localhost-config.xml + ignite-remote-config.xml + ignite-multicast-config.xml + + + + http://git-wip-us.apache.org/repos/asf/ignite/blob/54f499ce/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 7dc9f9a..9049526 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec @@ -62,10 +62,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. --> - - - - + http://git-wip-us.apache.org/repos/asf/ignite/blob/54f499ce/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/54f499ce/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 2f3969e..e715fbf 100644 --- a/modules/web-console/web-agent/pom.xml +++ b/modules/web-console/web-agent/pom.xml @@ -183,6 +183,14 @@ org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + + org.apache.maven.plugins maven-deploy-plugin true http://git-wip-us.apache.org/repos/asf/ignite/blob/54f499ce/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 88d4da8..270ece4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -998,12 +998,8 @@ - release - - - !skipDefault - - + licenses + org.apache.ignite http://git-wip-us.apache.org/repos/asf/ignite/blob/54f499ce/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7f24613..7fa3eef 100644 --- a/pom.xml +++ b/pom.xml @@ -164,29 +164,64 @@ - dev-libs - - true - + javadoc org.apache.maven.plugins + maven-javadoc-plugin + + + core-javadoc + + aggregate + + validate + + ${basedir}/target/javadoc + core + ${basedir}/assembly/docfiles/javadoc.css + 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 + + + + + + org.apache.maven.plugins maven-antrun-plugin 1.7 false + + + org.apache.ignite + ignite-tools + ${project.version} + + - dev-libs + javadoc-postprocessing-new run - package + initialize - - + + + + + + + + + + + + + + @@ -208,11 +243,6 @@ release - - - !skipDefault - - - + - + - + @@ -418,8 +406,8 @@ false - dependencies - prepare-package + ignite-dependencies + validate single @@ -427,15 +415,15 @@ ${basedir}/assembly/dependencies-${ignite.edition}.xml - ${basedir}/target/release-package + ${basedir}/target/release-package-${ignite.edition} libs false - release - prepare-package + ignite-release + validate single @@ -443,14 +431,14 @@ assembly/release-${ignite.edition}.xml - release-package + release-package-${ignite.edition} false dependencies-visor-console - prepare-package + validate single @@ -458,7 +446,7 @@ assembly/dependencies-visor-console.xml - target/release-package/bin + target/release-package-${ignite.edition}/bin include false @@ -466,7 +454,7 @@ scala-scripts - prepare-package + validate single @@ -474,7 +462,7 @@ assembly/release-scala.xml - target/release-package + target/release-package-${ignite.edition} bin false @@ -498,94 +486,6 @@ modules/yardstick - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - false - - - org.apache.ignite - ignite-tools - ${project.version} - - - - - release-yardstick - - run - - prepare-package - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -658,7 +558,7 @@ source-release-assembly-ignite - package + initialize single @@ -681,7 +581,7 @@ attach-artifact - package + initialize run @@ -744,7 +644,7 @@ files - install + initialize @@ -776,7 +676,7 @@ run - install + initialize false