Repository: incubator-ignite Updated Branches: refs/heads/ignite-950 d18536afb -> 2bc8b2534
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java b/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java new file mode 100644 index 0000000..f1bcb90 --- /dev/null +++ b/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java @@ -0,0 +1,38 @@ +/* + * 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. + */ + +package org.apache.ignite; + +import junit.framework.*; +import org.apache.ignite.mesos.*; + +/** + * Apache Mesos integration tests. + */ +public class IgniteMesosTestSuite extends TestSuite { + /** + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite() throws Exception { + TestSuite suite = new TestSuite("Apache Mesos Integration Test Suite"); + + suite.addTest(new TestSuite(IgniteSchedulerSelfTest.class)); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java b/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java new file mode 100644 index 0000000..d627553 --- /dev/null +++ b/modules/mesos/src/test/java/org/apache/ignite/mesos/IgniteSchedulerSelfTest.java @@ -0,0 +1,464 @@ +/* + * 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. + */ + +package org.apache.ignite.mesos; + +import junit.framework.*; +import org.apache.ignite.mesos.resource.*; +import org.apache.mesos.*; + +import java.util.*; +import java.util.regex.*; + +/** + * Scheduler tests. + */ +public class IgniteSchedulerSelfTest extends TestCase { + /** */ + private IgniteScheduler scheduler; + + /** {@inheritDoc} */ + @Override public void setUp() throws Exception { + super.setUp(); + + ClusterProperties clustProp = new ClusterProperties(); + + scheduler = new IgniteScheduler(clustProp, new ResourceProvider() { + @Override public String configName() { + return "config.xml"; + } + + @Override public String igniteUrl() { + return "ignite.jar"; + } + + @Override public String igniteConfigUrl() { + return "config.xml"; + } + + @Override public Collection<String> resourceUrl() { + return null; + } + }); + } + + /** + * @throws Exception If failed. + */ + public void testHostRegister() throws Exception { + Protos.Offer offer = createOffer("hostname", 4, 1024); + + DriverMock mock = new DriverMock(); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNotNull(mock.launchedTask); + assertEquals(1, mock.launchedTask.size()); + + Protos.TaskInfo taskInfo = mock.launchedTask.iterator().next(); + + assertEquals(4.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU)); + assertEquals(1024.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM)); + } + + /** + * @throws Exception If failed. + */ + public void testDeclineByCpu() throws Exception { + Protos.Offer offer = createOffer("hostname", 4, 1024); + + DriverMock mock = new DriverMock(); + + ClusterProperties clustProp = new ClusterProperties(); + clustProp.cpus(2); + + scheduler.setClusterProps(clustProp); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNotNull(mock.launchedTask); + assertEquals(1, mock.launchedTask.size()); + + Protos.TaskInfo taskInfo = mock.launchedTask.iterator().next(); + + assertEquals(2.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU)); + assertEquals(1024.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM)); + + mock.clear(); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNull(mock.launchedTask); + + Protos.OfferID declinedOffer = mock.declinedOffer; + + assertEquals(offer.getId(), declinedOffer); + } + + + /** + * @throws Exception If failed. + */ + public void testDeclineByMem() throws Exception { + Protos.Offer offer = createOffer("hostname", 4, 1024); + + DriverMock mock = new DriverMock(); + + ClusterProperties clustProp = new ClusterProperties(); + clustProp.memory(512); + + scheduler.setClusterProps(clustProp); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNotNull(mock.launchedTask); + assertEquals(1, mock.launchedTask.size()); + + Protos.TaskInfo taskInfo = mock.launchedTask.iterator().next(); + + assertEquals(4.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU)); + assertEquals(512.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM)); + + mock.clear(); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNull(mock.launchedTask); + + Protos.OfferID declinedOffer = mock.declinedOffer; + + assertEquals(offer.getId(), declinedOffer); + } + + /** + * @throws Exception If failed. + */ + public void testDeclineByMemCpu() throws Exception { + Protos.Offer offer = createOffer("hostname", 1, 1024); + + DriverMock mock = new DriverMock(); + + ClusterProperties clustProp = new ClusterProperties(); + clustProp.cpus(4); + clustProp.memory(2000); + + scheduler.setClusterProps(clustProp); + + double totalMem = 0, totalCpu = 0; + + for (int i = 0; i < 2; i++) { + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNotNull(mock.launchedTask); + assertEquals(1, mock.launchedTask.size()); + + Protos.TaskInfo taskInfo = mock.launchedTask.iterator().next(); + + totalCpu += resources(taskInfo.getResourcesList(), IgniteScheduler.CPU); + totalMem += resources(taskInfo.getResourcesList(), IgniteScheduler.MEM); + + mock.clear(); + } + + assertEquals(2.0, totalCpu); + assertEquals(2000.0, totalMem); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNull(mock.launchedTask); + + Protos.OfferID declinedOffer = mock.declinedOffer; + + assertEquals(offer.getId(), declinedOffer); + } + + /** + * @throws Exception If failed. + */ + public void testDeclineByCpuMinRequirements() throws Exception { + Protos.Offer offer = createOffer("hostname", 8, 10240); + + DriverMock mock = new DriverMock(); + + ClusterProperties clustProp = new ClusterProperties(); + clustProp.minCpuPerNode(12); + + scheduler.setClusterProps(clustProp); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNotNull(mock.declinedOffer); + + assertEquals(offer.getId(), mock.declinedOffer); + } + + /** + * @throws Exception If failed. + */ + public void testDeclineByMemMinRequirements() throws Exception { + Protos.Offer offer = createOffer("hostname", 8, 10240); + + DriverMock mock = new DriverMock(); + + ClusterProperties clustProp = new ClusterProperties(); + clustProp.minMemoryPerNode(15000); + + scheduler.setClusterProps(clustProp); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNotNull(mock.declinedOffer); + + assertEquals(offer.getId(), mock.declinedOffer); + } + + /** + * @throws Exception If failed. + */ + public void testHosthameConstraint() throws Exception { + Protos.Offer offer = createOffer("hostname", 8, 10240); + + DriverMock mock = new DriverMock(); + + ClusterProperties clustProp = new ClusterProperties(); + clustProp.hostnameConstraint(Pattern.compile("hostname")); + + scheduler.setClusterProps(clustProp); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNotNull(mock.declinedOffer); + + assertEquals(offer.getId(), mock.declinedOffer); + + offer = createOffer("hostnameAccept", 8, 10240); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNotNull(mock.launchedTask); + assertEquals(1, mock.launchedTask.size()); + } + + /** + * @throws Exception If failed. + */ + public void testPerNode() throws Exception { + Protos.Offer offer = createOffer("hostname", 8, 1024); + + DriverMock mock = new DriverMock(); + + ClusterProperties clustProp = new ClusterProperties(); + clustProp.memoryPerNode(1024); + clustProp.cpusPerNode(2); + + scheduler.setClusterProps(clustProp); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNotNull(mock.launchedTask); + + Protos.TaskInfo taskInfo = mock.launchedTask.iterator().next(); + + assertEquals(2.0, resources(taskInfo.getResourcesList(), IgniteScheduler.CPU)); + assertEquals(1024.0, resources(taskInfo.getResourcesList(), IgniteScheduler.MEM)); + + mock.clear(); + + offer = createOffer("hostname", 1, 2048); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNull(mock.launchedTask); + + assertNotNull(mock.declinedOffer); + assertEquals(offer.getId(), mock.declinedOffer); + + mock.clear(); + + offer = createOffer("hostname", 4, 512); + + scheduler.resourceOffers(mock, Collections.singletonList(offer)); + + assertNull(mock.launchedTask); + + assertNotNull(mock.declinedOffer); + assertEquals(offer.getId(), mock.declinedOffer); + } + + /** + * @param resourceType Resource type. + * @return Value. + */ + private Double resources(List<Protos.Resource> resources, String resourceType) { + for (Protos.Resource resource : resources) { + if (resource.getName().equals(resourceType)) + return resource.getScalar().getValue(); + } + + return null; + } + + /** + * @param hostname Hostname + * @param cpu Cpu count. + * @param mem Mem size. + * @return Offer. + */ + private Protos.Offer createOffer(String hostname, double cpu, double mem) { + return Protos.Offer.newBuilder() + .setId(Protos.OfferID.newBuilder().setValue("1")) + .setSlaveId(Protos.SlaveID.newBuilder().setValue("1")) + .setFrameworkId(Protos.FrameworkID.newBuilder().setValue("1")) + .setHostname(hostname) + .addResources(Protos.Resource.newBuilder() + .setType(Protos.Value.Type.SCALAR) + .setName(IgniteScheduler.CPU) + .setScalar(Protos.Value.Scalar.newBuilder().setValue(cpu).build()) + .build()) + .addResources(Protos.Resource.newBuilder() + .setType(Protos.Value.Type.SCALAR) + .setName(IgniteScheduler.MEM) + .setScalar(Protos.Value.Scalar.newBuilder().setValue(mem).build()) + .build()) + .build(); + } + + /** + * No-op implementation. + */ + public static class DriverMock implements SchedulerDriver { + /** */ + Collection<Protos.TaskInfo> launchedTask; + + /** */ + Protos.OfferID declinedOffer; + + /** + * Clears launched task. + */ + public void clear() { + launchedTask = null; + declinedOffer = null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status start() { + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status stop(boolean failover) { + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status stop() { + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status abort() { + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status join() { + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status run() { + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status requestResources(Collection<Protos.Request> requests) { + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status launchTasks(Collection<Protos.OfferID> offerIds, + Collection<Protos.TaskInfo> tasks, Protos.Filters filters) { + launchedTask = tasks; + + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status launchTasks(Collection<Protos.OfferID> offerIds, + Collection<Protos.TaskInfo> tasks) { + launchedTask = tasks; + + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status launchTasks(Protos.OfferID offerId, Collection<Protos.TaskInfo> tasks, + Protos.Filters filters) { + launchedTask = tasks; + + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status launchTasks(Protos.OfferID offerId, Collection<Protos.TaskInfo> tasks) { + launchedTask = tasks; + + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status killTask(Protos.TaskID taskId) { + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status declineOffer(Protos.OfferID offerId, Protos.Filters filters) { + declinedOffer = offerId; + + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status declineOffer(Protos.OfferID offerId) { + declinedOffer = offerId; + + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status reviveOffers() { + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status acknowledgeStatusUpdate(Protos.TaskStatus status) { + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status sendFrameworkMessage(Protos.ExecutorID executorId, Protos.SlaveID slaveId, + byte[] data) { + return null; + } + + /** {@inheritDoc} */ + @Override public Protos.Status reconcileTasks(Collection<Protos.TaskStatus> statuses) { + return null; + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/rest-http/pom.xml ---------------------------------------------------------------------- diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml index 1289bc7..64db144 100644 --- a/modules/rest-http/pom.xml +++ b/modules/rest-http/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-rest-http</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/scalar/pom.xml ---------------------------------------------------------------------- diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml index eea2ad1..d3fcf2e 100644 --- a/modules/scalar/pom.xml +++ b/modules/scalar/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-scalar</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/schedule/pom.xml ---------------------------------------------------------------------- diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml index 2585987..cac133f 100644 --- a/modules/schedule/pom.xml +++ b/modules/schedule/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-schedule</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/schema-import/pom.xml ---------------------------------------------------------------------- diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml index ac28ff9..64f85d9 100644 --- a/modules/schema-import/pom.xml +++ b/modules/schema-import/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-schema-import</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/slf4j/pom.xml ---------------------------------------------------------------------- diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml index 4c647c2..7c1e660 100644 --- a/modules/slf4j/pom.xml +++ b/modules/slf4j/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-slf4j</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/spring/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml index 9353c3e..e922215 100644 --- a/modules/spring/pom.xml +++ b/modules/spring/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-spring</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/ssh/pom.xml ---------------------------------------------------------------------- diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml index 0f4f3f4..0dcbd80 100644 --- a/modules/ssh/pom.xml +++ b/modules/ssh/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-ssh</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/tools/pom.xml ---------------------------------------------------------------------- diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml index 32881ed..2351d95 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-tools</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/urideploy/pom.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml index c2f4ba2..c6abfe5 100644 --- a/modules/urideploy/pom.xml +++ b/modules/urideploy/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-urideploy</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/visor-console/licenses/jcraft-revised-bsd.txt ---------------------------------------------------------------------- diff --git a/modules/visor-console/licenses/jcraft-revised-bsd.txt b/modules/visor-console/licenses/jcraft-revised-bsd.txt deleted file mode 100644 index 3748f98..0000000 --- a/modules/visor-console/licenses/jcraft-revised-bsd.txt +++ /dev/null @@ -1,28 +0,0 @@ -3-clause BSD license ------------------------------------------------------------------------------- -Copyright (c) 2002-2014 Atsuhiko Yamanaka, JCraft,Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the distribution. - - 3. The names of the authors may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/visor-console/pom.xml ---------------------------------------------------------------------- diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml index 2e07907..8e71970 100644 --- a/modules/visor-console/pom.xml +++ b/modules/visor-console/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-visor-console</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/visor-plugins/pom.xml ---------------------------------------------------------------------- diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml index 6d0c6e5..46b136e 100644 --- a/modules/visor-plugins/pom.xml +++ b/modules/visor-plugins/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-visor-plugins</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <dependencies> <!-- Ignite dependencies --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/web/pom.xml ---------------------------------------------------------------------- diff --git a/modules/web/pom.xml b/modules/web/pom.xml index 467a326..df6e923 100644 --- a/modules/web/pom.xml +++ b/modules/web/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-web</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/modules/yardstick/pom.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml index 2e72126..3d4ce66 100644 --- a/modules/yardstick/pom.xml +++ b/modules/yardstick/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>ignite-yardstick</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <properties> <yardstick.version>0.7.0</yardstick.version> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 44cb523..a514e35 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -317,6 +317,10 @@ <title>Spring Caching</title> <packages>org.apache.ignite.cache.spring</packages> </group> + <group> + <title>Mesos Framework</title> + <packages>org.apache.ignite.mesos*</packages> + </group> </groups> <header> <![CDATA[ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 91276e7..6f8524f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.apache.ignite</groupId> <artifactId>apache-ignite</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> @@ -69,6 +69,7 @@ <module>modules/codegen</module> <module>modules/gce</module> <module>modules/cloud</module> + <module>modules/mesos</module> </modules> <profiles> @@ -587,12 +588,12 @@ </copy> <!-- appending filename to md5 and sha1 files. to be improved. --> - <concat destfile="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.md5" append="true"> ${project.artifactId}-fabric-${project.version}-bin.zip</concat> - <concat destfile="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.sha1" append="true"> ${project.artifactId}-fabric-${project.version}-bin.zip</concat> - <concat destfile="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.md5" append="true"> ${project.artifactId}-hadoop-${project.version}-bin.zip</concat> - <concat destfile="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.sha1" append="true"> ${project.artifactId}-hadoop-${project.version}-bin.zip</concat> - <concat destfile="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.md5" append="true"> ${project.artifactId}-${project.version}-src.zip</concat> - <concat destfile="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.sha1" append="true"> ${project.artifactId}-${project.version}-src.zip</concat> + <concat destfile="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.md5" append="true">Â ${project.artifactId}-fabric-${project.version}-bin.zip</concat> + <concat destfile="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.sha1" append="true">Â ${project.artifactId}-fabric-${project.version}-bin.zip</concat> + <concat destfile="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.md5" append="true">Â ${project.artifactId}-hadoop-${project.version}-bin.zip</concat> + <concat destfile="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.sha1" append="true">Â ${project.artifactId}-hadoop-${project.version}-bin.zip</concat> + <concat destfile="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.md5" append="true">Â ${project.artifactId}-${project.version}-src.zip</concat> + <concat destfile="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.sha1" append="true">Â ${project.artifactId}-${project.version}-src.zip</concat> <copy file="${basedir}/KEYS" todir="${basedir}/target/site" failonerror="false" /> </target> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2bc8b253/scripts/git-patch-prop.sh ---------------------------------------------------------------------- diff --git a/scripts/git-patch-prop.sh b/scripts/git-patch-prop.sh index 9c52583..c856fb4 100644 --- a/scripts/git-patch-prop.sh +++ b/scripts/git-patch-prop.sh @@ -19,6 +19,6 @@ # # Git patch-file maker/applier properties. # -IGNITE_DEFAULT_BRANCH='ignite-sprint-3' +IGNITE_DEFAULT_BRANCH='ignite-sprint-5' PATCHES_HOME=${IGNITE_HOME}