Removed shmem from communication
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8c598c8d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8c598c8d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8c598c8d Branch: refs/heads/sprint-2 Commit: 8c598c8db613c5611479d30f0a0c30374fab3e42 Parents: dca3ca7 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Fri Mar 13 19:39:21 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Fri Mar 13 19:39:21 2015 -0700 ---------------------------------------------------------------------- assembly/dependencies-hadoop.xml | 7 ++-- pom.xml | 66 ++--------------------------------- 2 files changed, 6 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c598c8d/assembly/dependencies-hadoop.xml ---------------------------------------------------------------------- diff --git a/assembly/dependencies-hadoop.xml b/assembly/dependencies-hadoop.xml index ee49731..af52d76 100644 --- a/assembly/dependencies-hadoop.xml +++ b/assembly/dependencies-hadoop.xml @@ -119,9 +119,10 @@ <fileSet> <directory>target/libs</directory> <outputDirectory>/</outputDirectory> - <includes> - <include>*asm*.jar</include> - </includes> + <excludes> + <exclude>hadoop*.jar</exclude> + <exclude>log4j*.jar</exclude> + </excludes> </fileSet> <fileSet> <directory>target</directory> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c598c8d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b4f1dba..5a32a57 100644 --- a/pom.xml +++ b/pom.xml @@ -361,6 +361,7 @@ <outputDirectory>${basedir}</outputDirectory> <finalName>libs</finalName> <appendAssemblyId>false</appendAssemblyId> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> </configuration> </execution> @@ -377,6 +378,7 @@ <outputDirectory>${basedir}/libs</outputDirectory> <finalName>optional</finalName> <appendAssemblyId>false</appendAssemblyId> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> </configuration> </execution> @@ -1361,69 +1363,5 @@ </plugins> </build> </profile> - - <profile> - <id>opt-clns-prop</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - <inherited>false</inherited> - <dependencies> - <dependency> - <groupId>org.apache.ignite</groupId> - <artifactId>ignite-tools</artifactId> - <version>${ignite.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>optimized-classnames-generation</id> - <goals> - <goal>run</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <target> - <java - classname="org.apache.ignite.tools.marshaller.optimized.OptimizedClassNamesGenerator" - fork="true" - failonerror="true" - maxmemory="1g"> - <classpath> - <path location="${project.basedir}/modules/core/target/classes"/> - <path location="${project.basedir}/modules/aop/target/classes"/> - <path location="${project.basedir}/modules/aws/target/classes"/> - <path location="${project.basedir}/modules/email/target/classes"/> - <path location="${project.basedir}/modules/hadoop/target/classes"/> - <path location="${project.basedir}/modules/hibernate/target/classes"/> - <path location="${project.basedir}/modules/indexing/target/classes"/> - <path location="${project.basedir}/modules/jcl/target/classes"/> - <path location="${project.basedir}/modules/jta/target/classes"/> - <path location="${project.basedir}/modules/log4j/target/classes"/> - <path location="${project.basedir}/modules/rest-http/target/classes"/> - <path location="${project.basedir}/modules/schedule/target/classes"/> - <path location="${project.basedir}/modules/slf4j/target/classes"/> - <path location="${project.basedir}/modules/spring/target/classes"/> - <path location="${project.basedir}/modules/ssh/target/classes"/> - <path location="${project.basedir}/modules/urideploy/target/classes"/> - <path location="${project.basedir}/modules/web/target/classes"/> - <path location="${project.basedir}/modules/scalar/target/classes"/> - <path location="${project.basedir}/modules/visor-console/target/classes"/> - <path refid="maven.plugin.classpath"/> - </classpath> - <arg value="${project.basedir}/modules/core/src/main/java"/> - <jvmarg value="-XX:MaxPermSize=1g"/> - </java> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project>
