# gg-9470-rename
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a74cf2aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a74cf2aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a74cf2aa Branch: refs/heads/master Commit: a74cf2aa561b8e91aa854aea6070383b0bae4218 Parents: 07f7212 Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 4 23:32:38 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 4 23:32:38 2014 +0300 ---------------------------------------------------------------------- assembly/core-jar.xml | 4 +- assembly/dependencies-fabric.xml | 6 +- assembly/dependencies-hadoop.xml | 8 +- assembly/dependencies-optional-fabric.xml | 26 +- assembly/dependencies-optional-hadoop.xml | 30 +- assembly/dependencies-visor-console.xml | 6 +- assembly/dependencies-visor-trial.xml | 6 +- assembly/test.xml | 2 +- examples/pom.xml | 56 +- modules/aop/pom.xml | 26 +- modules/aws/pom.xml | 20 +- modules/clients/pom.xml | 36 +- modules/core/pom.xml | 12 +- .../src/main/java/org/apache/ignite/Ignite.java | 1 - .../org/gridgain/grid/kernal/GridKernal.java | 1 - modules/email/pom.xml | 14 +- modules/extdata/p2p/pom.xml | 20 +- modules/extdata/uri/pom.xml | 20 +- modules/hadoop/pom.xml | 32 +- modules/hibernate/pom.xml | 26 +- modules/indexing/pom.xml | 20 +- modules/jcl/pom.xml | 20 +- modules/jdk8-backport/pom.xml | 6 +- modules/jta/pom.xml | 20 +- modules/log4j/pom.xml | 20 +- modules/rest-http/pom.xml | 14 +- modules/scalar/pom.xml | 32 +- modules/schedule/pom.xml | 20 +- modules/slf4j/pom.xml | 14 +- modules/spring/pom.xml | 32 +- .../java/org/gridgain/grid/GridSpringBean.java | 1 - modules/ssh/pom.xml | 32 +- modules/tools/pom.xml | 8 +- modules/urideploy/pom.xml | 26 +- modules/visor-console/pom.xml | 34 +- modules/visor-plugins/pom.xml | 14 +- modules/visor-trial/pom.xml | 14 +- modules/web/pom.xml | 32 +- pom-standalone.xml | 1253 ------------------ pom.xml | 1200 ++++++++++++++++- 40 files changed, 1523 insertions(+), 1641 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/core-jar.xml ---------------------------------------------------------------------- diff --git a/assembly/core-jar.xml b/assembly/core-jar.xml index 17d824f..62ed9cf 100644 --- a/assembly/core-jar.xml +++ b/assembly/core-jar.xml @@ -38,8 +38,8 @@ <moduleSets> <moduleSet> <includes> - <include>org.gridgain:jdk8-backport</include> - <include>org.gridgain:gridgain-core</include> + <include>org.apache.ignite:jdk8-backport</include> + <include>org.apache.ignite:ignite-core</include> </includes> <sources> <includeModuleDirectory>false</includeModuleDirectory> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-fabric.xml ---------------------------------------------------------------------- diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml index 8506d10..72281a7 100644 --- a/assembly/dependencies-fabric.xml +++ b/assembly/dependencies-fabric.xml @@ -38,8 +38,8 @@ <moduleSets> <moduleSet> <includes> - <include>org.gridgain:gridgain-spring</include> - <include>org.gridgain:gridgain-indexing</include> + <include>org.apache.ignite:ignite-spring</include> + <include>org.apache.ignite:ignite-indexing</include> </includes> <sources> <includeModuleDirectory>true</includeModuleDirectory> @@ -82,7 +82,7 @@ <files> <file> - <source>target/gridgain-core-${gridgain.version}.jar</source> + <source>target/ignite-core-${ignite.version}.jar</source> <outputDirectory>/</outputDirectory> </file> </files> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-hadoop.xml ---------------------------------------------------------------------- diff --git a/assembly/dependencies-hadoop.xml b/assembly/dependencies-hadoop.xml index 26a7e74..4210083 100644 --- a/assembly/dependencies-hadoop.xml +++ b/assembly/dependencies-hadoop.xml @@ -38,8 +38,8 @@ <moduleSets> <moduleSet> <includes> - <include>org.gridgain:gridgain-spring</include> - <include>org.gridgain:gridgain-log4j</include> + <include>org.apache.ignite:ignite-spring</include> + <include>org.apache.ignite:ignite-log4j</include> </includes> <sources> <includeModuleDirectory>true</includeModuleDirectory> @@ -74,7 +74,7 @@ <moduleSet> <includes> - <include>org.gridgain:gridgain-hadoop</include> + <include>org.apache.ignite:ignite-hadoop</include> </includes> <sources> <includeModuleDirectory>true</includeModuleDirectory> @@ -120,7 +120,7 @@ <files> <file> - <source>target/gridgain-core-${gridgain.version}.jar</source> + <source>target/ignite-core-${ignite.version}.jar</source> <outputDirectory>/</outputDirectory> </file> </files> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-optional-fabric.xml ---------------------------------------------------------------------- diff --git a/assembly/dependencies-optional-fabric.xml b/assembly/dependencies-optional-fabric.xml index aa63686..fd4245c 100644 --- a/assembly/dependencies-optional-fabric.xml +++ b/assembly/dependencies-optional-fabric.xml @@ -39,19 +39,19 @@ <moduleSet> <includeSubModules>true</includeSubModules> <excludes> - <exclude>org.gridgain:jdk8-backport</exclude> - <exclude>org.gridgain:gridgain-core</exclude> - <exclude>org.gridgain:gridgain-clients</exclude> - <exclude>org.gridgain:gridgain-spring</exclude> - <exclude>org.gridgain:gridgain-tools</exclude> - <exclude>org.gridgain:gridgain-extdata-p2p</exclude> - <exclude>org.gridgain:gridgain-extdata-uri</exclude> - <exclude>org.gridgain:gridgain-examples</exclude> - <exclude>org.gridgain:gridgain-indexing</exclude> - <exclude>org.gridgain:gridgain-visor-console</exclude> - <exclude>org.gridgain:gridgain-visor-plugins</exclude> - <exclude>org.gridgain:gridgain-visor-trial</exclude> - <exclude>org.gridgain:gridgain-hadoop</exclude> + <exclude>org.apache.ignite:jdk8-backport</exclude> + <exclude>org.apache.ignite:ignite-core</exclude> + <exclude>org.apache.ignite:ignite-clients</exclude> + <exclude>org.apache.ignite:ignite-spring</exclude> + <exclude>org.apache.ignite:ignite-tools</exclude> + <exclude>org.apache.ignite:ignite-extdata-p2p</exclude> + <exclude>org.apache.ignite:ignite-extdata-uri</exclude> + <exclude>org.apache.ignite:ignite-examples</exclude> + <exclude>org.apache.ignite:ignite-indexing</exclude> + <exclude>org.apache.ignite:ignite-visor-console</exclude> + <exclude>org.apache.ignite:ignite-visor-plugins</exclude> + <exclude>org.apache.ignite:ignite-visor-trial</exclude> + <exclude>org.apache.ignite:ignite-hadoop</exclude> </excludes> <sources> <includeModuleDirectory>true</includeModuleDirectory> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-optional-hadoop.xml ---------------------------------------------------------------------- diff --git a/assembly/dependencies-optional-hadoop.xml b/assembly/dependencies-optional-hadoop.xml index 48b94f8..9fa6e76 100644 --- a/assembly/dependencies-optional-hadoop.xml +++ b/assembly/dependencies-optional-hadoop.xml @@ -39,21 +39,21 @@ <moduleSet> <includeSubModules>true</includeSubModules> <excludes> - <exclude>org.gridgain:jdk8-backport</exclude> - <exclude>org.gridgain:gridgain-core</exclude> - <exclude>org.gridgain:gridgain-clients</exclude> - <exclude>org.gridgain:gridgain-spring</exclude> - <exclude>org.gridgain:gridgain-tools</exclude> - <exclude>org.gridgain:gridgain-extdata-p2p</exclude> - <exclude>org.gridgain:gridgain-extdata-uri</exclude> - <exclude>org.gridgain:gridgain-examples</exclude> - <exclude>org.gridgain:gridgain-hibernate</exclude> - <exclude>org.gridgain:gridgain-indexing</exclude> - <exclude>org.gridgain:gridgain-jta</exclude> - <exclude>org.gridgain:gridgain-hadoop</exclude> - <exclude>org.gridgain:gridgain-visor-console</exclude> - <exclude>org.gridgain:gridgain-visor-plugins</exclude> - <exclude>org.gridgain:gridgain-visor-trial</exclude> + <exclude>org.apache.ignite:jdk8-backport</exclude> + <exclude>org.apache.ignite:ignite-core</exclude> + <exclude>org.apache.ignite:ignite-clients</exclude> + <exclude>org.apache.ignite:ignite-spring</exclude> + <exclude>org.apache.ignite:ignite-tools</exclude> + <exclude>org.apache.ignite:ignite-extdata-p2p</exclude> + <exclude>org.apache.ignite:ignite-extdata-uri</exclude> + <exclude>org.apache.ignite:ignite-examples</exclude> + <exclude>org.apache.ignite:ignite-hibernate</exclude> + <exclude>org.apache.ignite:ignite-indexing</exclude> + <exclude>org.apache.ignite:ignite-jta</exclude> + <exclude>org.apache.ignite:ignite-hadoop</exclude> + <exclude>org.apache.ignite:ignite-visor-console</exclude> + <exclude>org.apache.ignite:ignite-visor-plugins</exclude> + <exclude>org.apache.ignite:ignite-visor-trial</exclude> </excludes> <sources> <includeModuleDirectory>true</includeModuleDirectory> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-visor-console.xml ---------------------------------------------------------------------- diff --git a/assembly/dependencies-visor-console.xml b/assembly/dependencies-visor-console.xml index 7c8eaae..c2b9d1b 100644 --- a/assembly/dependencies-visor-console.xml +++ b/assembly/dependencies-visor-console.xml @@ -38,7 +38,7 @@ <moduleSets> <moduleSet> <includes> - <include>org.gridgain:gridgain-visor-console</include> + <include>org.apache.ignite:ignite-visor-console</include> </includes> <sources> <includeModuleDirectory>false</includeModuleDirectory> @@ -87,8 +87,8 @@ <moduleSet> <includes> - <include>org.gridgain:gridgain-ssh</include> - <include>org.gridgain:gridgain-spring</include> + <include>org.apache.ignite:ignite-ssh</include> + <include>org.apache.ignite:ignite-spring</include> </includes> <sources> <includeModuleDirectory>false</includeModuleDirectory> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-visor-trial.xml ---------------------------------------------------------------------- diff --git a/assembly/dependencies-visor-trial.xml b/assembly/dependencies-visor-trial.xml index 2af86ac..f6e7140 100644 --- a/assembly/dependencies-visor-trial.xml +++ b/assembly/dependencies-visor-trial.xml @@ -38,7 +38,7 @@ <moduleSets> <moduleSet> <includes> - <include>org.gridgain:gridgain-visor-trial</include> + <include>org.apache.ignite:ignite-visor-trial</include> </includes> <sources> @@ -64,8 +64,8 @@ <directory>${basedir}/target/libs</directory> <outputDirectory>/include/visorui</outputDirectory> <excludes> - <exclude>gridgain-spring-*.jar</exclude> - <exclude>gridgain-ssh-*.jar</exclude> + <exclude>ignite-spring-*.jar</exclude> + <exclude>ignite-ssh-*.jar</exclude> <exclude>commons-logging-*.jar</exclude> <exclude>jsch-*.jar</exclude> <exclude>scala-library-*.jar</exclude> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/test.xml ---------------------------------------------------------------------- diff --git a/assembly/test.xml b/assembly/test.xml index 045e0f0..b5d3413 100644 --- a/assembly/test.xml +++ b/assembly/test.xml @@ -38,7 +38,7 @@ <moduleSets> <moduleSet> <includes> - <include>org.gridgain:gridgain-aop</include> + <include>org.apache.ignite:ignite-aop</include> </includes> <sources> <includeModuleDirectory>false</includeModuleDirectory> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 22fc5a7..ec4db45 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -19,49 +19,49 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>..</relativePath> </parent> - <artifactId>gridgain-examples</artifactId> + <artifactId>ignite-examples</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-hibernate</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-hibernate</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-scalar</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-scalar</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-spring</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-spring</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-log4j</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-log4j</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-indexing</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -149,17 +149,17 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-schedule</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-schedule</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/aop/pom.xml ---------------------------------------------------------------------- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 06de5e0..0641038 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-aop</artifactId> + <artifactId>ignite-aop</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -65,16 +65,16 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-log4j</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-log4j</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/aws/pom.xml ---------------------------------------------------------------------- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index d6eaeb7..8ebfef9 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-aws</artifactId> + <artifactId>ignite-aws</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -59,9 +59,9 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/clients/pom.xml ---------------------------------------------------------------------- diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index c150030..c9e4c3e 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -19,9 +19,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> @@ -29,9 +29,9 @@ <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -48,23 +48,23 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-indexing</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-log4j</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-log4j</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-rest-http</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-rest-http</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> @@ -77,9 +77,9 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 1761c3b..cf84023 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -19,13 +19,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../..</relativePath> </parent> - <artifactId>gridgain-core</artifactId> + <artifactId>ignite-core</artifactId> <dependencies> <dependency> @@ -35,9 +35,9 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> + <groupId>org.apache.ignite</groupId> <artifactId>jdk8-backport</artifactId> - <version>${gridgain.version}</version> + <version>${ignite.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/core/src/main/java/org/apache/ignite/Ignite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java index f509214..2cc3f9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignite.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java @@ -18,7 +18,6 @@ import org.gridgain.grid.cache.*; import org.gridgain.grid.dr.*; import org.gridgain.grid.ggfs.*; import org.gridgain.grid.hadoop.*; -import org.gridgain.grid.portables.*; import org.gridgain.grid.security.*; import org.gridgain.grid.util.typedef.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java index 2f2319f..2d59610 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java @@ -60,7 +60,6 @@ import org.gridgain.grid.kernal.processors.session.*; import org.gridgain.grid.kernal.processors.streamer.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.portables.*; import org.gridgain.grid.security.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.authentication.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/email/pom.xml ---------------------------------------------------------------------- diff --git a/modules/email/pom.xml b/modules/email/pom.xml index 2c6156f..80a7ae0 100644 --- a/modules/email/pom.xml +++ b/modules/email/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-email</artifactId> + <artifactId>ignite-email</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/extdata/p2p/pom.xml ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml index 101116c..9b8581e 100644 --- a/modules/extdata/p2p/pom.xml +++ b/modules/extdata/p2p/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../..</relativePath> </parent> - <artifactId>gridgain-extdata-p2p</artifactId> + <artifactId>ignite-extdata-p2p</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> </dependencies> @@ -63,9 +63,9 @@ <version>1.7</version> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-tools</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-tools</artifactId> + <version>${ignite.version}</version> </dependency> </dependencies> <executions> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/extdata/uri/pom.xml ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml index 9bf19a8..3d7c343 100644 --- a/modules/extdata/uri/pom.xml +++ b/modules/extdata/uri/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../..</relativePath> </parent> - <artifactId>gridgain-extdata-uri</artifactId> + <artifactId>ignite-extdata-uri</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -84,9 +84,9 @@ <version>1.7</version> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-tools</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-tools</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml index 86b48a1..d1306d0 100644 --- a/modules/hadoop/pom.xml +++ b/modules/hadoop/pom.xml @@ -19,25 +19,25 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-hadoop</artifactId> + <artifactId>ignite-hadoop</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-log4j</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-log4j</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -103,16 +103,16 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-spring</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-spring</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/hibernate/pom.xml ---------------------------------------------------------------------- diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml index 7034d63..7d8af78 100644 --- a/modules/hibernate/pom.xml +++ b/modules/hibernate/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-hibernate</artifactId> + <artifactId>ignite-hibernate</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -41,9 +41,9 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-jta</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-jta</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> @@ -76,9 +76,9 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/indexing/pom.xml ---------------------------------------------------------------------- diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml index f856f47..d0a6023 100644 --- a/modules/indexing/pom.xml +++ b/modules/indexing/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-indexing</artifactId> + <artifactId>ignite-indexing</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -59,9 +59,9 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/jcl/pom.xml ---------------------------------------------------------------------- diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml index a2b9aed..1328a24 100644 --- a/modules/jcl/pom.xml +++ b/modules/jcl/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-jcl</artifactId> + <artifactId>ignite-jcl</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -41,9 +41,9 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/jdk8-backport/pom.xml ---------------------------------------------------------------------- diff --git a/modules/jdk8-backport/pom.xml b/modules/jdk8-backport/pom.xml index 2033edf..d7bb05c 100644 --- a/modules/jdk8-backport/pom.xml +++ b/modules/jdk8-backport/pom.xml @@ -18,9 +18,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/jta/pom.xml ---------------------------------------------------------------------- diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml index a08fe92..abd8dae 100644 --- a/modules/jta/pom.xml +++ b/modules/jta/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-jta</artifactId> + <artifactId>ignite-jta</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -55,9 +55,9 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/log4j/pom.xml ---------------------------------------------------------------------- diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml index 365ad8b..35bca8a 100644 --- a/modules/log4j/pom.xml +++ b/modules/log4j/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-log4j</artifactId> + <artifactId>ignite-log4j</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -40,9 +40,9 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/rest-http/pom.xml ---------------------------------------------------------------------- diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml index fa57bae..26eafa0 100644 --- a/modules/rest-http/pom.xml +++ b/modules/rest-http/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-rest-http</artifactId> + <artifactId>ignite-rest-http</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/scalar/pom.xml ---------------------------------------------------------------------- diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml index b7e7700..0e69c06 100644 --- a/modules/scalar/pom.xml +++ b/modules/scalar/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../..</relativePath> </parent> - <artifactId>gridgain-scalar</artifactId> + <artifactId>ignite-scalar</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -41,16 +41,16 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-spring</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-spring</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-indexing</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> @@ -109,9 +109,9 @@ <version>1.7</version> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-tools</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-tools</artifactId> + <version>${ignite.version}</version> </dependency> </dependencies> <executions> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/schedule/pom.xml ---------------------------------------------------------------------- diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml index 938bad5..0db5c3f 100644 --- a/modules/schedule/pom.xml +++ b/modules/schedule/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-schedule</artifactId> + <artifactId>ignite-schedule</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -41,9 +41,9 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/slf4j/pom.xml ---------------------------------------------------------------------- diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml index 5f960aa..9fc225b 100644 --- a/modules/slf4j/pom.xml +++ b/modules/slf4j/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-slf4j</artifactId> + <artifactId>ignite-slf4j</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/spring/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml index a1a99fc..74a4568 100644 --- a/modules/spring/pom.xml +++ b/modules/spring/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-spring</artifactId> + <artifactId>ignite-spring</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -77,23 +77,23 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-urideploy</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-urideploy</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-log4j</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-log4j</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java index 7d17fda..6e034ae 100644 --- a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java +++ b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java @@ -17,7 +17,6 @@ import org.apache.ignite.product.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.dr.*; import org.gridgain.grid.hadoop.*; -import org.gridgain.grid.portables.*; import org.gridgain.grid.security.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/ssh/pom.xml ---------------------------------------------------------------------- diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml index 4f48ae2..6b648d3 100644 --- a/modules/ssh/pom.xml +++ b/modules/ssh/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-ssh</artifactId> + <artifactId>ignite-ssh</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -41,23 +41,23 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-spring</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-spring</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-log4j</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-log4j</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/tools/pom.xml ---------------------------------------------------------------------- diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml index 94b949e..4235ccd 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -18,13 +18,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../..</relativePath> </parent> - <artifactId>gridgain-tools</artifactId> + <artifactId>ignite-tools</artifactId> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/urideploy/pom.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml index 7543ae8..6434f07 100644 --- a/modules/urideploy/pom.xml +++ b/modules/urideploy/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-urideploy</artifactId> + <artifactId>ignite-urideploy</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -96,17 +96,17 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-tools</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-tools</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/visor-console/pom.xml ---------------------------------------------------------------------- diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml index 202be7e..541bd5a 100644 --- a/modules/visor-console/pom.xml +++ b/modules/visor-console/pom.xml @@ -19,31 +19,31 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../..</relativePath> </parent> - <artifactId>gridgain-visor-console</artifactId> + <artifactId>ignite-visor-console</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-ssh</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-ssh</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-spring</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-spring</artifactId> + <version>${ignite.version}</version> </dependency> <!-- Third party dependencies --> @@ -86,9 +86,9 @@ <!-- Test dependencies --> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-indexing</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> @@ -155,7 +155,7 @@ <phase>prepare-package</phase> <configuration> <target> - <zip destfile="target/gridgain-visor-console-${gridgain.version}-javadoc.jar" + <zip destfile="target/ignite-visor-console-${ignite.version}-javadoc.jar" basedir="target/site/scaladocs" encoding="UTF-8"/> </target> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/visor-plugins/pom.xml ---------------------------------------------------------------------- diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml index ea82b93..de00914 100644 --- a/modules/visor-plugins/pom.xml +++ b/modules/visor-plugins/pom.xml @@ -19,20 +19,20 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../..</relativePath> </parent> - <artifactId>gridgain-visor-plugins</artifactId> + <artifactId>ignite-visor-plugins</artifactId> <dependencies> <!-- Gridgain dependencies --> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <!-- Gridgain dependencies --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/visor-trial/pom.xml ---------------------------------------------------------------------- diff --git a/modules/visor-trial/pom.xml b/modules/visor-trial/pom.xml index 03edde4..299e01e 100644 --- a/modules/visor-trial/pom.xml +++ b/modules/visor-trial/pom.xml @@ -19,13 +19,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../..</relativePath> </parent> - <artifactId>gridgain-visor-trial</artifactId> + <artifactId>ignite-visor-trial</artifactId> <packaging>pom</packaging> @@ -40,8 +40,8 @@ <!-- Gridgain dependencies --> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-visor</artifactId> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-visor</artifactId> <version>RELEASE</version> </dependency> @@ -92,7 +92,7 @@ <goal>copy-dependencies</goal> </goals> <configuration combine.self="override"> - <excludeArtifactIds>gridgain-core,jdk8-backport</excludeArtifactIds> + <excludeArtifactIds>ignite-core,jdk8-backport</excludeArtifactIds> <outputDirectory>target/libs</outputDirectory> <includeScope>runtime</includeScope> <excludeTransitive>false</excludeTransitive> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/web/pom.xml ---------------------------------------------------------------------- diff --git a/modules/web/pom.xml b/modules/web/pom.xml index 7eb775c..6f90a1a 100644 --- a/modules/web/pom.xml +++ b/modules/web/pom.xml @@ -19,19 +19,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.gridgain</groupId> - <artifactId>gridgain</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite</artifactId> + <version>${ignite.version}</version> <relativePath>../../</relativePath> </parent> - <artifactId>gridgain-web</artifactId> + <artifactId>ignite-web</artifactId> <dependencies> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> </dependency> <dependency> @@ -41,16 +41,16 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-spring</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-spring</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-indexing</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${ignite.version}</version> <scope>test</scope> </dependency> @@ -69,9 +69,9 @@ </dependency> <dependency> - <groupId>org.gridgain</groupId> - <artifactId>gridgain-core</artifactId> - <version>${gridgain.version}</version> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${ignite.version}</version> <type>test-jar</type> <scope>test</scope> </dependency>
