usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [31/50] git commit: Removed Jukito completely
Date Thu, 06 Nov 2014 00:15:17 GMT
Removed  Jukito completely


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2aeefd51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2aeefd51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2aeefd51

Branch: refs/heads/two-dot-o
Commit: 2aeefd516a9398673348998a874064e2116959ad
Parents: 71822f5
Author: Todd Nine <tnine@apigee.com>
Authored: Mon Nov 3 15:20:04 2014 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Mon Nov 3 15:20:04 2014 -0700

----------------------------------------------------------------------
 .../main/groovy/configure_elasticsearch.groovy  |   2 +-
 stack/core/pom.xml                              |  15 +-
 .../CpEntityDeleteListenerTest.java             |   3 +-
 .../CpEntityIndexDeleteListenerTest.java        |   3 -
 .../1.4-UG/_maven.repositories                  |   4 -
 .../1.4-UG/jukito-build-tools-1.4-UG.jar        | Bin 4603 -> 0 bytes
 .../1.4-UG/jukito-build-tools-1.4-UG.pom        |  13 -
 .../jukito-build-tools/maven-metadata-local.xml |  12 -
 .../jukito-parent/1.4-UG/_maven.repositories    |   3 -
 .../1.4-UG/jukito-parent-1.4-UG.pom             | 313 -------------------
 .../jukito-parent/maven-metadata-local.xml      |  12 -
 .../jukito-samples/1.4-UG/_maven.repositories   |   4 -
 .../1.4-UG/jukito-samples-1.4-UG.jar            | Bin 5103 -> 0 bytes
 .../1.4-UG/jukito-samples-1.4-UG.pom            |  33 --
 .../jukito-samples/maven-metadata-local.xml     |  12 -
 .../jukito/jukito/1.4-UG/_maven.repositories    |   5 -
 .../jukito/1.4-UG/jukito-1.4-UG-sources.jar     | Bin 30660 -> 0 bytes
 .../org/jukito/jukito/1.4-UG/jukito-1.4-UG.jar  | Bin 42832 -> 0 bytes
 .../org/jukito/jukito/1.4-UG/jukito-1.4-UG.pom  |  93 ------
 .../org/jukito/jukito/maven-metadata-local.xml  |  12 -
 stack/pom.xml                                   |  15 +-
 21 files changed, 18 insertions(+), 536 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
index 3658d7f..cd91026 100644
--- a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
+++ b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
@@ -66,7 +66,7 @@ threadpool.index.type: fixed
 threadpool.index.size: 160
 threadpool.index.queue_size: 0
 threadpool.bulk.type: fixed
-threadpool.bulk.size: 5000
+threadpool.bulk.size: 1000
 threadpool.bulk.queue_size: 0
 threadpool.search.size: 10000
 threadpool.search.type: fixed

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index 7bd4da4..a303d17 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -475,6 +475,14 @@
       <scope>test</scope>
     </dependency>
 
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.jvnet.mock-javamail</groupId>
       <artifactId>mock-javamail</artifactId>
@@ -541,13 +549,6 @@
     </dependency>
 
     <dependency>
-        <groupId>org.jukito</groupId>
-        <artifactId>jukito</artifactId>
-        <version>1.4-UG</version>
-        <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>com.codahale.metrics</groupId>
       <artifactId>metrics-core</artifactId>
       <version>${metrics.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityDeleteListenerTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityDeleteListenerTest.java
b/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityDeleteListenerTest.java
index 16d2e79..6efab38 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityDeleteListenerTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityDeleteListenerTest.java
@@ -21,7 +21,6 @@ package org.apache.usergrid.corepersistence;
 import java.util.ArrayList;
 import java.util.UUID;
 
-import org.jukito.JukitoRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -44,7 +43,7 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(JukitoRunner.class)
+
 public class CpEntityDeleteListenerTest {
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityIndexDeleteListenerTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityIndexDeleteListenerTest.java
b/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityIndexDeleteListenerTest.java
index 6b92d90..d1ee559 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityIndexDeleteListenerTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityIndexDeleteListenerTest.java
@@ -23,11 +23,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
 
-import org.jukito.JukitoRunner;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.usergrid.persistence.collection.CollectionScope;
 import org.apache.usergrid.persistence.collection.MvccEntity;
@@ -56,7 +54,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith( JukitoRunner.class )
 @Ignore("Needs updated")
 public class CpEntityIndexDeleteListenerTest {
     EntityIndex entityIndex;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/_maven.repositories
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/_maven.repositories
b/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/_maven.repositories
deleted file mode 100644
index 49ede0f..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/_maven.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Thu Dec 12 21:34:16 EET 2013
-jukito-build-tools-1.4-UG.pom>=
-jukito-build-tools-1.4-UG.jar>=

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/jukito-build-tools-1.4-UG.jar
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/jukito-build-tools-1.4-UG.jar
b/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/jukito-build-tools-1.4-UG.jar
deleted file mode 100644
index 9cc5b09..0000000
Binary files a/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/jukito-build-tools-1.4-UG.jar
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/jukito-build-tools-1.4-UG.pom
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/jukito-build-tools-1.4-UG.pom
b/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/jukito-build-tools-1.4-UG.pom
deleted file mode 100644
index 7d34775..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/1.4-UG/jukito-build-tools-1.4-UG.pom
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.jukito</groupId>
-        <artifactId>jukito-parent</artifactId>
-        <version>1.4-UG</version>
-    </parent>
-
-    <artifactId>jukito-build-tools</artifactId>
-    <name>Jukito Build Tools</name>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/maven-metadata-local.xml
b/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/maven-metadata-local.xml
deleted file mode 100644
index 63b0601..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito-build-tools/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.jukito</groupId>
-  <artifactId>jukito-build-tools</artifactId>
-  <versioning>
-    <release>1.4-UG</release>
-    <versions>
-      <version>1.4-UG</version>
-    </versions>
-    <lastUpdated>20131212193416</lastUpdated>
-  </versioning>
-</metadata>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito-parent/1.4-UG/_maven.repositories
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito-parent/1.4-UG/_maven.repositories
b/stack/corepersistence/m2/repository/org/jukito/jukito-parent/1.4-UG/_maven.repositories
deleted file mode 100644
index 851dbbd..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito-parent/1.4-UG/_maven.repositories
+++ /dev/null
@@ -1,3 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Thu Dec 12 21:34:15 EET 2013
-jukito-parent-1.4-UG.pom>=

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito-parent/1.4-UG/jukito-parent-1.4-UG.pom
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito-parent/1.4-UG/jukito-parent-1.4-UG.pom
b/stack/corepersistence/m2/repository/org/jukito/jukito-parent/1.4-UG/jukito-parent-1.4-UG.pom
deleted file mode 100644
index 809106e..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito-parent/1.4-UG/jukito-parent-1.4-UG.pom
+++ /dev/null
@@ -1,313 +0,0 @@
-<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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
-
-    <groupId>org.jukito</groupId>
-    <artifactId>jukito-parent</artifactId>
-    <version>1.4-UG</version>
-    <packaging>pom</packaging>
-    <name>Jukito</name>
-    <inceptionYear>2010</inceptionYear>
-    <description>A testing framework with automocking base on JUnit, Guice and Mokito.</description>
-    <url>http://jukito.org</url>
-
-    <licenses>
-        <license>
-            <name>Apache 2</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-            <comments>A business-friendly OSS license</comments>
-        </license>
-    </licenses>
-
-    <organization>
-        <name>ArcBees Inc.</name>
-        <url>http://arcbees.com</url>
-    </organization>
-
-    <developers>
-        <developer>
-            <name>Philippe Beaudoin</name>
-            <email>philippe.beaudoin@gmail.com</email>
-            <url>http://www.google.com/profiles/philippe.beaudoin</url>
-            <organization>ArcBees</organization>
-            <organizationUrl>http://arcbees.com</organizationUrl>
-            <roles>
-                <role>architect</role>
-                <role>lead developer</role>
-            </roles>
-            <timezone>-8</timezone>
-            <properties>
-                <picUrl>http://goo.gl/xV2K8</picUrl>
-            </properties>
-        </developer>
-        <developer>
-            <name>Christian Goudreau</name>
-            <email>goudreau.christian@gmail.com</email>
-            <organization>ArcBees</organization>
-            <organizationUrl>http://arcbees.com</organizationUrl>
-            <roles>
-                <role>developer</role>
-            </roles>
-            <timezone>-5</timezone>
-        </developer>
-    </developers>
-
-    <scm>
-        <connection>scm:git:git://github.com/ArcBees/Jukito.git/</connection>
-        <developerConnection>scm:git:https://git@github.com/ArcBees/Jukito.git</developerConnection>
-        <url>https://github.com/ArcBees/Jukito</url>
-    </scm>
-
-    <issueManagement>
-        <system>GitHub Issues</system>
-        <url>https://github.com/ArcBees/Jukito/issues</url>
-    </issueManagement>
-
-    <ciManagement>
-        <system>Team City</system>
-        <url>http://teamcity.gonevertical.org</url>
-    </ciManagement>
-
-    <mailingLists>
-        <mailingList>
-            <name>Development</name>
-            <subscribe>jukito+subscribe@googlegroups.com</subscribe>
-            <unsubscribe>jukito+unsubscribe@googlegroups.com</unsubscribe>
-            <post>jukito@googlegroups.com</post>
-            <archive>http://groups.google.com/group/jukito</archive>
-        </mailingList>
-    </mailingLists>
-
-    <properties>
-        <target.jdk>1.6</target.jdk>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <guice.version>3.0</guice.version>
-        <junit.version>4.11</junit.version>
-        <mockito.version>1.9.5</mockito.version>
-
-        <maven-checkstyle-plugin.version>2.10</maven-checkstyle-plugin.version>
-        <maven-compiler-plugin.version>3.0</maven-compiler-plugin.version>
-        <maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
-        <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
-        <maven-javadoc-plugin.version>2.9</maven-javadoc-plugin.version>
-        <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
-        <maven-surefire-plugin.version>2.14.1</maven-surefire-plugin.version>
-        <animal-sniffer-maven-plugin.version>1.9</animal-sniffer-maven-plugin.version>
-        <github.version>0.7</github.version>
-    </properties>
-
-    <modules>
-        <module>jukito-build-tools</module>
-        <module>jukito</module>
-        <module>jukito-samples</module>
-    </modules>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${maven-compiler-plugin.version}</version>
-                    <configuration>
-                        <source>${target.jdk}</source>
-                        <target>${target.jdk}</target>
-                        <encoding>${project.build.sourceEncoding}</encoding>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin.version}</version>
-                    <configuration>
-                        <includes>
-                            <include>**/*Test.java</include>
-                            <include>**/*TestCase.java</include>
-                        </includes>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>${maven-deploy-plugin.version}</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>${maven-checkstyle-plugin.version}</version>
-                    <configuration>
-                        <configLocation>/org/jukito/checkstyle.xml</configLocation>
-                        <suppressionsLocation>/org/jukito/suppressions.xml</suppressionsLocation>
-                        <propertyExpansion>checkstyle.root=/org/jukito/</propertyExpansion>
-                        <consoleOutput>true</consoleOutput>
-                        <failsOnError>true</failsOnError>
-                        <linkXRef>false</linkXRef>
-                        <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>validate</id>
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>checkstyle</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.jukito</groupId>
-                            <artifactId>jukito-build-tools</artifactId>
-                            <version>${project.version}</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>${maven-source-plugin.version}</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>jar</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <configuration>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <releaseProfiles>release</releaseProfiles>
-                        <arguments>-Psonatype-oss-release -Prelease -Dgpg.passphrase=${gpg.passphrase}</arguments>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>animal-sniffer-maven-plugin</artifactId>
-                    <version>${animal-sniffer-maven-plugin.version}</version>
-                    <configuration>
-                        <signature>
-                            <groupId>org.codehaus.mojo.signature</groupId>
-                            <artifactId>java15</artifactId>
-                            <version>1.0</version>
-                        </signature>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>process-classes</phase>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <!-- run 'mvn javadoc:aggregate' to generate -->
-                <!-- run 'mvn javadoc:aggregate -X' to debug -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>${maven-javadoc-plugin.version}</version>
-                    <configuration>
-                        <maxmemory>2048</maxmemory>
-                        <failOnError>true</failOnError>
-                        <doctitle>Jukito Javadocs</doctitle>
-                        <links>
-                            <link>http://download.oracle.com/javase/6/docs/api/</link>
-                            <link>http://google-web-toolkit.googlecode.com/svn/javadoc/latest/</link>
-                            <link>http://google-gin.googlecode.com/svn/trunk/javadoc/</link>
-                            <link>http://google-guice.googlecode.com/svn/trunk/javadoc/</link>
-                            <link>http://aopalliance.sourceforge.net/doc/</link>
-                            <link>https://developers.google.com/appengine/docs/java/javadoc/</link>
-                            <link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
-                        </links>
-                        <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
-                        <reportOutputDirectory>${project.reporting.outputDirectory}/javadoc</reportOutputDirectory>
-                        <excludes>
-                            <exclude>**/*.txt</exclude>
-                        </excludes>
-                        <header>
-                            <![CDATA[
-                            <a href="https://github.com/ArcBees/Jukito" target="_blank">Back
to Jukito Home</a>
-                        ]]>
-                        </header>
-                    </configuration>
-                </plugin>
-
-                <!-- run 'mvn site' to upload -->
-                <!-- run 'mvn site -X' to debug and upload. -->
-                <plugin>
-                    <groupId>com.github.github</groupId>
-                    <artifactId>site-maven-plugin</artifactId>
-                    <version>${github.version}</version>
-                    <configuration>
-                        <!-- <dryRun>true</dryRun> -->
-                        <message>Creating site for ${project.version}</message>
-                        <!-- github > sets the ~/.m2/setting.xml server id profile
-->
-                        <server>github</server>
-                        <excludes>
-                            <exclude>*.DS_Store</exclude>
-                            <exclude>*.sh</exclude>
-                            <exclude>options</exclude>
-                            <exclude>packages</exclude>
-                        </excludes>
-                        <force>true</force>
-                        <merge>true</merge>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>site</phase>
-                            <goals>
-                                <goal>site</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>${mockito.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.google.inject</groupId>
-                <artifactId>guice</artifactId>
-                <version>${guice.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.google.inject.extensions</groupId>
-                <artifactId>guice-assistedinject</artifactId>
-                <version>${guice.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito-parent/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito-parent/maven-metadata-local.xml
b/stack/corepersistence/m2/repository/org/jukito/jukito-parent/maven-metadata-local.xml
deleted file mode 100644
index 436d7df..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito-parent/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.jukito</groupId>
-  <artifactId>jukito-parent</artifactId>
-  <versioning>
-    <release>1.4-UG</release>
-    <versions>
-      <version>1.4-UG</version>
-    </versions>
-    <lastUpdated>20131212193415</lastUpdated>
-  </versioning>
-</metadata>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/_maven.repositories
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/_maven.repositories
b/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/_maven.repositories
deleted file mode 100644
index f034661..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/_maven.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Thu Dec 12 21:34:50 EET 2013
-jukito-samples-1.4-UG.jar>=
-jukito-samples-1.4-UG.pom>=

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/jukito-samples-1.4-UG.jar
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/jukito-samples-1.4-UG.jar
b/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/jukito-samples-1.4-UG.jar
deleted file mode 100644
index fd53ad9..0000000
Binary files a/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/jukito-samples-1.4-UG.jar
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/jukito-samples-1.4-UG.pom
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/jukito-samples-1.4-UG.pom
b/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/jukito-samples-1.4-UG.pom
deleted file mode 100644
index c424410..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito-samples/1.4-UG/jukito-samples-1.4-UG.pom
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.jukito</groupId>
-        <artifactId>jukito-parent</artifactId>
-        <version>1.4-UG</version>
-    </parent>
-
-    <artifactId>jukito-samples</artifactId>
-    <name>Jukito Samples</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jukito</groupId>
-            <artifactId>jukito-build-tools</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.jukito</groupId>
-            <artifactId>jukito</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito-samples/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito-samples/maven-metadata-local.xml
b/stack/corepersistence/m2/repository/org/jukito/jukito-samples/maven-metadata-local.xml
deleted file mode 100644
index 4ecb506..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito-samples/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.jukito</groupId>
-  <artifactId>jukito-samples</artifactId>
-  <versioning>
-    <release>1.4-UG</release>
-    <versions>
-      <version>1.4-UG</version>
-    </versions>
-    <lastUpdated>20131212193450</lastUpdated>
-  </versioning>
-</metadata>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/_maven.repositories
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/_maven.repositories
b/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/_maven.repositories
deleted file mode 100644
index bbe77c7..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/_maven.repositories
+++ /dev/null
@@ -1,5 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Thu Dec 12 21:34:49 EET 2013
-jukito-1.4-UG.pom>=
-jukito-1.4-UG-sources.jar>=
-jukito-1.4-UG.jar>=

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG-sources.jar
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG-sources.jar
b/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG-sources.jar
deleted file mode 100644
index dfd6cfc..0000000
Binary files a/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG-sources.jar
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG.jar
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG.jar
b/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG.jar
deleted file mode 100644
index ade247c..0000000
Binary files a/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG.jar
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG.pom
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG.pom
b/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG.pom
deleted file mode 100644
index 25884e8..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito/1.4-UG/jukito-1.4-UG.pom
+++ /dev/null
@@ -1,93 +0,0 @@
-<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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.jukito</groupId>
-        <artifactId>jukito-parent</artifactId>
-        <version>1.4-UG</version>
-    </parent>
-
-    <artifactId>jukito</artifactId>
-    <packaging>jar</packaging>
-    <name>jukito</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-            </plugin>
-
-            <!-- run 'mvn javadoc:aggregate' to generate -->
-            <!-- run 'mvn javadoc:aggregate -X' to debug -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
-
-            <!-- run 'mvn site' to upload -->
-            <!-- run 'mvn site -X' to debug and upload. -->
-            <plugin>
-                <groupId>com.github.github</groupId>
-                <artifactId>site-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-assistedinject</artifactId>
-        </dependency>
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/corepersistence/m2/repository/org/jukito/jukito/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/m2/repository/org/jukito/jukito/maven-metadata-local.xml
b/stack/corepersistence/m2/repository/org/jukito/jukito/maven-metadata-local.xml
deleted file mode 100644
index 1ad86bf..0000000
--- a/stack/corepersistence/m2/repository/org/jukito/jukito/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.jukito</groupId>
-  <artifactId>jukito</artifactId>
-  <versioning>
-    <release>1.4-UG</release>
-    <versions>
-      <version>1.4-UG</version>
-    </versions>
-    <lastUpdated>20131212193449</lastUpdated>
-  </versioning>
-</metadata>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aeefd51/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 2a2fcb0..34cf5aa 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -116,6 +116,7 @@
     <antlr.version>3.4</antlr.version>
     <tika.version>1.4</tika.version>
     <elasticsearch.version>1.3.2</elasticsearch.version>
+    <mockito.version>1.10.8</mockito.version>
 
     <usergrid.it.forkCount>3</usergrid.it.forkCount>
     <usergrid.it.reuseForks>false</usergrid.it.reuseForks>
@@ -1977,13 +1978,13 @@
     </plugins>
   </reporting>
 
-    <repositories>
-        <repository>
-            <id>local-dependencies</id>
-            <name>local-depedendencies</name>
-            <url>file://${project.basedir}/../m2/repository</url>
-        </repository>
-    </repositories>
+    <!--<repositories>-->
+        <!--<repository>-->
+            <!--<id>local-dependencies</id>-->
+            <!--<name>local-depedendencies</name>-->
+            <!--<url>file://${project.basedir}/../m2/repository</url>-->
+        <!--</repository>-->
+    <!--</repositories>-->
 
     <scm>
     	<url>https://git-wip-us.apache.org/repos/asf/incubator-usergrid.git</url>


Mime
View raw message