http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59cc41be/examples/pom.xml ---------------------------------------------------------------------- diff --cc examples/pom.xml index 2fc062b,b64680b..249af75 --- a/examples/pom.xml +++ b/examples/pom.xml @@@ -93,6 -160,20 +93,13 @@@ <type>test-jar</type> <scope>test</scope> </dependency> + + <dependency> - <groupId>org.apache.ignite</groupId> - <artifactId>ignite-schedule</artifactId> - <version>${ignite.version}</version> - <scope>test</scope> - </dependency> - - <dependency> + <groupId>org.gridgain</groupId> + <artifactId>ignite-shmem</artifactId> + <version>1.0.0</version> + <scope>test</scope> + </dependency> </dependencies> <build> @@@ -111,7 -214,41 +140,41 @@@ <profiles> <profile> - <id>java8</id> + <id>scala</id> + + <dependencies> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-scalar</artifactId> - <version>${ignite.version}</version> ++ <version>1.0.0-RELEASE-TEST-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_2.11</artifactId> + <version>2.2.2</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>java8-examples</id> <activation> <jdk>[1.8,)</jdk>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59cc41be/modules/codegen/pom.xml ---------------------------------------------------------------------- diff --cc modules/codegen/pom.xml index 55bc49a,2071972..87ac34c --- a/modules/codegen/pom.xml +++ b/modules/codegen/pom.xml @@@ -43,7 -44,13 +43,13 @@@ <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-core</artifactId> - <version>${ignite.version}</version> + <version>1.0.0-RELEASE-TEST-SNAPSHOT</version> </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${ignite.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59cc41be/modules/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59cc41be/modules/hadoop/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59cc41be/modules/schema-import/pom.xml ---------------------------------------------------------------------- diff --cc modules/schema-import/pom.xml index 0000000,bbfc61d..d00ad59 mode 000000,100644..100644 --- a/modules/schema-import/pom.xml +++ b/modules/schema-import/pom.xml @@@ -1,0 -1,104 +1,102 @@@ + <?xml version="1.0" encoding="UTF-8"?> + + <!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + + <!-- + POM file. + --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> ++<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.ignite</groupId> - <artifactId>ignite</artifactId> - <version>${ignite.version}</version> - <relativePath>../..</relativePath> ++ <artifactId>ignite-parent</artifactId> ++ <version>1</version> ++ <relativePath>../../parent</relativePath> + </parent> + + <artifactId>ignite-schema-import</artifactId> ++ <version>1.0.0-RELEASE-TEST-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> - <version>${ignite.version}</version> ++ <version>1.0.0-RELEASE-TEST-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.3.175</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + + <testResources> + <testResource> + <directory>src/test/java</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </testResource> + </testResources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.apache.ignite.schema.ui.SchemaImportApp</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>jfxrt.jar</id> + <activation> + <jdk>[1.7,1.8)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javafx</groupId> + <artifactId>jfxrt</artifactId> + <version>${java.version}</version> + <scope>system</scope> + <systemPath>${java.home}/lib/jfxrt.jar</systemPath> + </dependency> + </dependencies> + </profile> + </profiles> + </project> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59cc41be/modules/yardstick/pom.xml ---------------------------------------------------------------------- diff --cc modules/yardstick/pom.xml index cc4e573,87ecb61..41ba6e5 --- a/modules/yardstick/pom.xml +++ b/modules/yardstick/pom.xml @@@ -48,16 -50,14 +48,14 @@@ <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-spring</artifactId> - <version>${ignite.version}</version> + <version>1.0.0-RELEASE-TEST-SNAPSHOT</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-indexing</artifactId> - <version>${ignite.version}</version> - </dependency> + <version>1.0.0-RELEASE-TEST-SNAPSHOT</version> - <scope>test</scope> - </dependency> ++ </dependency> <dependency> <groupId>org.yardstickframework</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59cc41be/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 7769ad4,e2bb9f2..176add0 --- a/pom.xml +++ b/pom.xml @@@ -449,64 -1363,25 +449,26 @@@ </build> </profile> -- <profile> - <id>opt-clns-prop</id> - <id>java8</id> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <properties> - <javadoc.opts>-Xdoclint:none</javadoc.opts> - </properties> -- <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>${project.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> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> -- </plugin> -- </plugins> -- </build> -- </profile> -- </profiles> ++ ++ <profile> ++ <id>java8</id> ++ <activation> ++ <jdk>[1.8,)</jdk> ++ </activation> ++ <properties> ++ <javadoc.opts>-Xdoclint:none</javadoc.opts> ++ </properties> ++ <build> ++ <plugins> ++ <plugin> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <configuration> ++ <source>1.8</source> ++ <target>1.8</target> ++ </configuration> ++ </plugin> ++ </plugins> ++ </build> ++ </profile> ++ </profiles> </project>
