Return-Path: 
 <commits-return-73292-apmail-ignite-commits-archive=ignite.apache.org@ignite.apache.org>
X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org
Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A79411882E
	for <apmail-ignite-commits-archive@minotaur.apache.org>;
 Sat,  5 Sep 2015 02:31:46 +0000 (UTC)
Received: (qmail 84355 invoked by uid 500); 5 Sep 2015 02:31:46 -0000
Delivered-To: apmail-ignite-commits-archive@ignite.apache.org
Received: (qmail 84286 invoked by uid 500); 5 Sep 2015 02:31:46 -0000
Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ignite.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ignite.apache.org>
List-Post: <mailto:commits@ignite.apache.org>
List-Id: <commits.ignite.apache.org>
Reply-To: dev@ignite.apache.org
Delivered-To: mailing list commits@ignite.apache.org
Received: (qmail 83262 invoked by uid 99); 5 Sep 2015 02:31:45 -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; Sat, 05 Sep 2015 02:31:45 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 9D835E04D7; Sat,  5 Sep 2015 02:31:45 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: akuznetsov@apache.org
To: commits@ignite.apache.org
Date: Sat, 05 Sep 2015 02:32:28 -0000
Message-Id: <11e919a1075c47e0a5ee65397e5a4c66@git.apache.org>
In-Reply-To: <ad05fd52c68946879bdc4d2332567559@git.apache.org>
References: <ad05fd52c68946879bdc4d2332567559@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [45/45] ignite git commit: Merge branches 'ignite-843' and 'master'
 of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843

Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843

Conflicts:
	pom.xml


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

Branch: refs/heads/ignite-843
Commit: ce1559bc8bf734837251e371c9caa9061c67c3a4
Parents: 5d3b129 e5eede5 2b16b57
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Sat Sep 5 09:31:16 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Sat Sep 5 09:31:16 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/common-module.js    |  15 +--
 .../src/main/js/public/stylesheets/style.scss   |   5 +
 .../src/main/js/views/sql/sql.jade              |   3 +-
 .../platform/src/main/cpp/common/configure.ac   |   2 +-
 .../src/main/cpp/core-test/configure.ac         |   2 +-
 modules/platform/src/main/cpp/core/configure.ac |   2 +-
 .../Apache.Ignite.Core.csproj                   |   8 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 pom.xml                                         | 117 +++++++++++++++++++
 11 files changed, 145 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ce1559bc/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 8668495,8668495,6f9c848..f246996
--- a/pom.xml
+++ b/pom.xml
@@@@ -743,40 -743,40 -739,121 +743,157 @@@@
           </profile>
   
           <profile>
  +            <id>control-center</id>
  +            <modules>
  +                <module>modules/control-center-agent</module>
  +                <module>modules/control-center-web</module>
  +                <module>modules/schema-import-db</module>
  +            </modules>
  +        </profile>
  +
  +        <profile>
  +            <id>ignite-npm</id>
  +            <build>
  +                <plugins>
  +                    <plugin>
  +                        <groupId>org.codehaus.mojo</groupId>
  +                        <artifactId>exec-maven-plugin</artifactId>
  +                        <executions>
  +                            <execution>
  +                                <phase>compile</phase>
  +                                <goals>
  +                                    <goal>exec</goal>
  +                                </goals>
  +                            </execution>
  +                        </executions>
  +                        <configuration>
  +                            <executable>npm</executable>
  +                            <arguments>
  +                                <argument>publish</argument>
  +                                <argument>modules/nodejs/src/main/js</argument>
  +                            </arguments>
  +                        </configuration>
  +                    </plugin>
  +                </plugins>
  +            </build>
  +        </profile>
+++        
+++        <profile>
++             <id>update-versions</id>
++             <!-- updates dotnet & cpp versions -->
++             <build>
++                 <plugins>
++                     <plugin>
++                         <groupId>org.apache.maven.plugins</groupId>
++                         <artifactId>maven-antrun-plugin</artifactId>
++                         <version>1.7</version>
++                         <executions>
++                             <execution>
++                                 <id>update-versions</id>
++                                 <goals>
++                                     <goal>run</goal>
++                                 </goals>
++                                 <phase>validate</phase>
++                                 <configuration>
++                                     <target>
++                                         <script language="javascript">
++                                             function setClientVersion(ggVer, clientVer) {
++                                             var p = project.getProperty(ggVer);
++ 
++                                             if (java.util.regex.Pattern.matches(".*-p\\d+", p))
++                                             project.setProperty(clientVer, p.replace("-p", "."));
++                                             else
++                                             if (java.util.regex.Pattern.matches(".*-[a-zA-Z]+\\d+.*", p))
++                                             project.setProperty(clientVer, p.replaceAll("-[a-zA-Z]+(\\d+)?.*", ".$1"));
++                                             else
++                                             project.setProperty(clientVer, p);
++                                             }
++ 
++                                             function fix(dest, source) {
++                                             project.setProperty(dest, project.getProperty(source).replace("-SNAPSHOT",
++                                             ""));
++                                             }
++ 
++                                             fix('ignite.version.fixed', 'project.version');
++                                             fix('new.ignite.version.fixed', 'new.ignite.version');
++                                             setClientVersion('ignite.version.fixed', 'old.client.version');
++                                             setClientVersion('new.ignite.version.fixed', 'new.client.version');
++                                         </script>
++ 
++                                         <echo message="Update ignite.version in dotnet client" />
++                                         <echo message="${new.client.version}" />
++ 
++                                         <replaceregexp byline="true" encoding="UTF-8">
++                                             <regexp pattern="(\[assembly:\s*Assembly\w*Version\w*\(&quot;)\d.\d.\d(.\d)?(&quot;\)\])" />
++                                             <substitution expression="\1${new.client.version}\3" />
++                                             <fileset dir="${basedir}/">
++                                                 <include name="**/AssemblyInfo.cs" />
++                                                 <include name="**/AssemblyInfo.cpp" />
++                                             </fileset>
++                                         </replaceregexp>
++ 
++                                         <echo message="Update ignite.version in cpp client" />
++                                         <replaceregexp byline="true" encoding="UTF-8">
++                                             <regexp pattern="(AC_INIT.+\[)\d.\d.\d(.\d)?(\].+)" />
++                                             <substitution expression="\1${new.client.version}\3" />
++                                             <fileset dir="${basedir}/">
++                                                 <include name="**/configure.ac" />
++                                             </fileset>
++                                         </replaceregexp>
++ 
++                                         <replaceregexp byline="true" encoding="UTF-8">
++                                             <regexp pattern="(define GG_VERSION_STR_WIN &quot;)\d.\d.\d(.\d)?(&quot;)" />
++                                             <substitution expression="\1${new.client.version}\3" />
++                                             <fileset dir="${basedir}/">
++                                                 <include name="**/resource.h" />
++                                             </fileset>
++                                         </replaceregexp>
++ 
++                                         <replaceregexp byline="true" encoding="UTF-16">
++                                             <regexp pattern="(Version&quot;, &quot;)\d.\d.\d.\d(&quot;)" />
++                                             <substitution expression="\1${new.client.version}\2" />
++                                             <fileset dir="${basedir}/">
++                                                 <include name="**/Resource.rc" />
++                                             </fileset>
++                                         </replaceregexp>
++ 
++                                         <script language="javascript">
++                                             function setBinVersion(clientVer, binVer) {
++                                             var p = project.getProperty(clientVer).replace(".", ",");
++ 
++                                             if (p.split(',').length == 3)
++                                             project.setProperty(binVer, p + ',0');
++                                             else
++                                             project.setProperty(binVer, p);
++                                             }
++ 
++                                             setBinVersion('old.client.version', 'old.bin.version');
++                                             setBinVersion('new.client.version', 'new.bin.version');
++                                         </script>
++ 
++                                         <replaceregexp byline="true" encoding="UTF-8">
++                                             <regexp pattern="(define GG_VERSION_BIN_WIN )\d,\d,\d,\d" />
++                                             <substitution expression="\1${new.bin.version}" />
++                                             <fileset dir="${basedir}/">
++                                                 <include name="**/resource.h" />
++                                             </fileset>
++                                         </replaceregexp>
++ 
++                                         <replaceregexp byline="true" encoding="UTF-16">
++                                             <regexp pattern="(VERSION )\d,\d,\d,\d" />
++                                             <substitution expression="\1${new.bin.version}" />
++                                             <fileset dir="${basedir}/">
++                                                 <include name="**/Resource.rc" />
++                                             </fileset>
++                                         </replaceregexp>
++                                     </target>
++                                 </configuration>
++                             </execution>
++                         </executions>
++                     </plugin>
++                 </plugins>
++             </build>
++         </profile>
       </profiles>
   
       <build>