Repository: incubator-ignite Updated Branches: refs/heads/ignite-release-test-no-mod 909e34f8a -> cd65fc271
ignite-release-test removed ignite.version Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7c1e5b7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7c1e5b7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7c1e5b7a Branch: refs/heads/ignite-release-test-no-mod Commit: 7c1e5b7a46038056d69ba3087053e6734b04648a Parents: 909e34f Author: avinogradov <[email protected]> Authored: Wed Mar 4 17:59:33 2015 +0300 Committer: avinogradov <[email protected]> Committed: Wed Mar 4 17:59:33 2015 +0300 ---------------------------------------------------------------------- examples/pom-standalone.xml | 16 ++++++++-------- modules/core/pom.xml | 4 ++-- modules/scalar/pom.xml | 4 ++-- modules/visor-console/pom.xml | 2 +- parent/pom.xml | 1 - pom.xml | 18 +++++++++--------- 6 files changed, 22 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c1e5b7a/examples/pom-standalone.xml ---------------------------------------------------------------------- diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml index aeb1639..5de7433 100644 --- a/examples/pom-standalone.xml +++ b/examples/pom-standalone.xml @@ -33,7 +33,7 @@ <groupId>org.apache.ignite</groupId> <artifactId>ignite-examples</artifactId> - <version>1</version> + <version>${ignite.version}</version> <dependencies> <dependency> @@ -45,37 +45,37 @@ <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-core</artifactId> - <version>1</version> + <version>${ignite.version}</version> </dependency> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-hibernate</artifactId> - <version>1</version> + <version>${ignite.version}</version> </dependency> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-spring</artifactId> - <version>1</version> + <version>${ignite.version}</version> </dependency> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-log4j</artifactId> - <version>1</version> + <version>${ignite.version}</version> </dependency> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-indexing</artifactId> - <version>1</version> + <version>${ignite.version}</version> </dependency> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-schedule</artifactId> - <version>1</version> + <version>${ignite.version}</version> </dependency> <dependency> @@ -162,7 +162,7 @@ <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-scalar</artifactId> - <version>1</version> + <version>${ignite.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c1e5b7a/modules/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 1273a97..a2428e8 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -210,7 +210,7 @@ <replaceregexp file="${props.file}" byline="true"> <regexp pattern="ignite.version=.*" /> - <substitution expression="ignite.version=${ignite.version}" /> + <substitution expression="ignite.version=${project.version}" /> </replaceregexp> <replaceregexp file="${props.file}" byline="true"> @@ -230,7 +230,7 @@ <replaceregexp file="${props.file}" byline="true"> <regexp pattern="ignite.update.status.params=.*" /> - <substitution expression="ignite.update.status.params=ver=${ignite.version}" /> + <substitution expression="ignite.update.status.params=ver=${project.version}" /> </replaceregexp> </target> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c1e5b7a/modules/scalar/pom.xml ---------------------------------------------------------------------- diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml index a49f993..d0a95cd 100644 --- a/modules/scalar/pom.xml +++ b/modules/scalar/pom.xml @@ -132,7 +132,7 @@ <table style="padding: 0px 10px 10px 10px; width: 100%" border="0"> <tr> <td> - <nobr>Ignite™ - Scalar DSL, ver. <strong>${ignite.version}</strong></nobr> + <nobr>Ignite™ - Scalar DSL, ver. <strong>${project.version}</strong></nobr> <br> <a target=_blank href="https://incubator.apache.org/projects/ignite.html";><nobr>2015 Copyright © Apache Software Foundation</nobr></a> </td> @@ -169,7 +169,7 @@ <fileset dir="target/site/scaladocs" /> </replaceregexp> - <zip destfile="target/ignite-scalar-${ignite.version}-javadoc.jar" basedir="target/site/scaladocs" encoding="UTF-8" /> + <zip destfile="target/ignite-scalar-${project.version}-javadoc.jar" basedir="target/site/scaladocs" encoding="UTF-8" /> </target> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c1e5b7a/modules/visor-console/pom.xml ---------------------------------------------------------------------- diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml index ce915f0..398eaf1 100644 --- a/modules/visor-console/pom.xml +++ b/modules/visor-console/pom.xml @@ -145,7 +145,7 @@ <phase>prepare-package</phase> <configuration> <target> - <zip destfile="target/ignite-visor-console-${ignite.version}-javadoc.jar" basedir="target/site/scaladocs" encoding="UTF-8" /> + <zip destfile="target/ignite-visor-console-${project.version}-javadoc.jar" basedir="target/site/scaladocs" encoding="UTF-8" /> </target> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c1e5b7a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 664f32d..e439f76 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -33,7 +33,6 @@ </parent> <properties> - <ignite.version>1.0.0-RC2-SNAPSHOT</ignite.version> <ignite.edition>fabric</ignite.edition> <hadoop.version>2.4.1</hadoop.version> <spring.version>4.1.0.RELEASE</spring.version> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c1e5b7a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7a592bd..ebf0830 100644 --- a/pom.xml +++ b/pom.xml @@ -263,8 +263,8 @@ </tagletArtifact> </taglet> </taglets> - <doctitle>Ignite ${ignite.version}</doctitle> - <windowtitle>Ignite ${ignite.version}</windowtitle> + <doctitle>Ignite ${project.version}</doctitle> + <windowtitle>Ignite ${project.version}</windowtitle> <breakiterator>true</breakiterator> <verbose>true</verbose> <show>protected</show> @@ -417,7 +417,7 @@ <b>Ignite Fabric</b> </td> <td>: - ver. <strong>${ignite.version}</strong> + ver. <strong>${project.version}</strong> </td> </tr> <tr style="padding: 0; margin: 0"> @@ -457,8 +457,8 @@ </taglets> <reportOutputDirectory>${basedir}/target/javadoc</reportOutputDirectory> <destDir>core</destDir> - <doctitle>Ignite ${ignite.version}</doctitle> - <windowtitle>Ignite ${ignite.version}</windowtitle> + <doctitle>Ignite ${project.version}</doctitle> + <windowtitle>Ignite ${project.version}</windowtitle> <breakiterator>true</breakiterator> <verbose>true</verbose> <show>protected</show> @@ -620,7 +620,7 @@ <b>Apache Ignite Fabric</b> </td> <td>: - ver. <strong>${ignite.version}</strong> + ver. <strong>${project.version}</strong> </td> </tr> <tr style="padding: 0; margin: 0"> @@ -732,15 +732,15 @@ </fileset> </replaceregexp> - <zip destfile="${basedir}/target/ignite-${ignite.edition}-${ignite.version}.zip" encoding="UTF-8"> - <zipfileset dir="${basedir}/target/release-package" prefix="ignite-${ignite.edition}-${ignite.version}" filemode="755"> + <zip destfile="${basedir}/target/ignite-${ignite.edition}-${project.version}.zip" encoding="UTF-8"> + <zipfileset dir="${basedir}/target/release-package" prefix="ignite-${ignite.edition}-${project.version}" 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}-${ignite.version}"> + <zipfileset dir="${basedir}/target/release-package" prefix="ignite-${ignite.edition}-${project.version}"> <exclude name="**/*.sh" /> <exclude name="**/configure" /> <exclude name="**/install-sh" />
