Merge branch 'release-2.1.1'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/849df674 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/849df674 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/849df674 Branch: refs/heads/apigee-sso-provider Commit: 849df67462ecb78b9fd1690c93e969fefc407c51 Parents: b0fbf14 a8f4218 Author: Michael Russo <[email protected]> Authored: Wed Jul 13 22:37:46 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Wed Jul 13 22:37:46 2016 -0700 ---------------------------------------------------------------------- docs/data-storage/collections.md | 144 ++++ docs/orgs-and-apps/application.md | 104 +++ .../main/resources/usergrid-default.properties | 44 +- .../src/test/resources/usergrid-test.properties | 20 +- stack/core/pom.xml | 819 ++++++++++--------- .../usergrid/corepersistence/CoreModule.java | 66 +- .../corepersistence/CpEntityManager.java | 378 +++++---- .../corepersistence/CpEntityManagerFactory.java | 68 +- .../corepersistence/CpRelationManager.java | 99 ++- .../corepersistence/EntityManagerFig.java | 9 + .../asyncevents/EventBuilderImpl.java | 7 +- .../index/CollectionSettingsCache.java | 47 ++ .../index/CollectionSettingsCacheFactory.java | 44 + .../index/CollectionSettingsCacheFig.java | 39 + .../index/CollectionSettingsCacheImpl.java | 122 +++ .../corepersistence/index/IndexSchemaCache.java | 50 -- .../index/IndexSchemaCacheFactory.java | 44 - .../index/IndexSchemaCacheFig.java | 39 - .../index/IndexSchemaCacheImpl.java | 120 --- .../corepersistence/index/IndexServiceImpl.java | 65 +- .../index/ReIndexServiceImpl.java | 44 +- .../service/ApplicationServiceImpl.java | 22 +- .../usergrid/persistence/EntityManager.java | 26 +- .../apache/usergrid/persistence/PathQuery.java | 3 +- .../usergrid/persistence/RelationManager.java | 2 + .../index/AsyncIndexServiceTest.java | 2 +- .../corepersistence/index/IndexServiceTest.java | 92 ++- .../resources/usergrid-custom-test.properties | 13 + stack/corepersistence/actorsystem/pom.xml | 106 +++ .../persistence/actorsystem/ActorSystemFig.java | 83 ++ .../actorsystem/ActorSystemManager.java | 86 ++ .../actorsystem/ActorSystemManagerImpl.java | 459 +++++++++++ .../actorsystem/ActorSystemModule.java | 34 + .../persistence/actorsystem/ClientActor.java | 205 +++++ .../actorsystem/GuiceActorProducer.java | 46 ++ .../persistence/actorsystem/RouterProducer.java | 51 ++ .../src/main/resources/application.conf | 50 ++ .../actorsystem/ActorServiceServiceTest.java | 74 ++ stack/corepersistence/collection/pom.xml | 120 ++- .../collection/EntityCollectionManager.java | 8 +- .../EntityCollectionManagerFactory.java | 4 +- .../persistence/collection/FieldSet.java | 12 + .../exception/WriteUniqueVerifyException.java | 2 +- .../collection/guice/CollectionModule.java | 9 + .../EntityCollectionManagerFactoryImpl.java | 166 ++-- .../impl/EntityCollectionManagerImpl.java | 180 ++-- .../mvcc/stage/CollectionIoEvent.java | 14 +- .../mvcc/stage/delete/MarkCommit.java | 36 +- .../mvcc/stage/write/WriteCommit.java | 82 +- .../mvcc/stage/write/WriteUniqueVerify.java | 142 +++- .../serialization/SerializationFig.java | 4 - .../UniqueValueSerializationStrategy.java | 25 +- .../serialization/impl/MutableFieldSet.java | 12 + .../impl/UniqueFieldRowKeySerializer.java | 3 +- .../UniqueValueSerializationStrategyImpl.java | 138 +++- ...iqueValueSerializationStrategyProxyImpl.java | 21 +- .../uniquevalues/ReservationCache.java | 87 ++ .../uniquevalues/ReservationCacheActor.java | 87 ++ .../uniquevalues/UniqueValueActor.java | 282 +++++++ .../uniquevalues/UniqueValueException.java | 33 + .../uniquevalues/UniqueValuesFig.java | 67 ++ .../uniquevalues/UniqueValuesRouter.java | 70 ++ .../uniquevalues/UniqueValuesService.java | 74 ++ .../uniquevalues/UniqueValuesServiceImpl.java | 372 +++++++++ .../uniquevalues/UniqueValuesTable.java | 42 + .../uniquevalues/UniqueValuesTableImpl.java | 94 +++ .../collection/AbstractUniqueValueTest.java | 50 ++ .../collection/EntityCollectionManagerIT.java | 171 ++-- .../EntityCollectionManagerStressTest.java | 21 +- .../collection/guice/TestCollectionModule.java | 17 + .../mvcc/stage/delete/MarkCommitTest.java | 10 +- .../mvcc/stage/write/WriteCommitTest.java | 8 +- .../mvcc/stage/write/WriteUniqueVerifyIT.java | 121 ++- .../mvcc/stage/write/WriteUniqueVerifyTest.java | 55 +- ...niqueValueSerializationStrategyImplTest.java | 26 +- .../UniqueValuesServiceDeleteTest.java | 149 ++++ .../uniquevalues/UniqueValuesServiceTest.java | 185 +++++ .../src/test/resources/usergrid-CHOP.properties | 18 + .../src/test/resources/usergrid-UNIT.properties | 19 + .../src/test/resources/usergrid.properties | 32 + stack/corepersistence/common/pom.xml | 23 +- .../core/guice/SettingsValidationCluster.java | 18 + .../core/guice/MigrationManagerRule.java | 18 + .../guice/SettingsValidationClusterTest.java | 19 + .../src/test/resources/usergrid-UNIT.properties | 19 + .../src/test/resources/usergrid.properties | 19 + stack/corepersistence/model/pom.xml | 16 + .../persistence/model/entity/EntityMap.java | 18 + .../persistence/model/field/ArrayField.java | 7 + .../persistence/model/field/ByteArrayField.java | 9 + .../persistence/model/field/DistanceField.java | 9 + .../model/field/EntityObjectField.java | 9 + .../persistence/model/field/FieldTypeName.java | 3 - .../persistence/model/field/ListField.java | 7 + .../persistence/model/field/LocationField.java | 7 + .../persistence/model/field/NullField.java | 7 + .../persistence/model/field/SetField.java | 7 + .../model/field/value/EntityObject.java | 2 +- .../persistence/model/util/EntityUtils.java | 18 + .../persistence/model/util/UUIDGenerator.java | 18 + .../persistence/model/field/EntityTest.java | 18 + .../model/util/UUIDGeneratorTest.java | 18 + stack/corepersistence/pom.xml | 72 ++ stack/corepersistence/queryindex/pom.xml | 18 +- .../index/impl/EsEntityIndexFactoryImpl.java | 2 + .../index/impl/EsEntityIndexImpl.java | 53 +- stack/pom.xml | 6 - .../usergrid/rest/AbstractContextResource.java | 1 + .../apache/usergrid/rest/ShutdownListener.java | 11 + .../rest/applications/CollectionResource.java | 97 +-- .../rest/applications/ServiceResource.java | 8 +- ...ApplicationAlreadyExistsExceptionMapper.java | 32 + .../apache/usergrid/rest/NotificationsIT.java | 6 +- .../org/apache/usergrid/rest/UniqueCatsIT.java | 233 ++++++ .../apache/usergrid/rest/UniqueValuesIT.java | 224 +++++ .../rest/UniqueValuesPerformanceIT.java | 165 ++++ .../rest/applications/ApplicationDeleteIT.java | 115 ++- .../applications/ApplicationResourceIT.java | 2 +- .../collection/CollectionsResourceIT.java | 251 +++--- .../collection/users/PermissionsResourceIT.java | 4 +- .../resources/corepersistence-UNIT.properties | 2 + .../resources/usergrid-custom-test.properties | 19 +- .../resources/usergrid-rest-deploy-context.xml | 33 +- stack/services/pom.xml | 6 + .../services/AbstractCollectionService.java | 71 +- .../services/AbstractConnectionsService.java | 9 +- .../usergrid/services/AbstractService.java | 53 +- .../applications/ApplicationsService.java | 4 +- .../resources/usergrid-services-context.xml | 2 +- .../usergrid/services/ServiceInvocationIT.java | 28 +- .../usergrid/tools/UniqueValueScanner.java | 124 +-- 131 files changed, 6850 insertions(+), 1884 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/849df674/stack/core/pom.xml ---------------------------------------------------------------------- diff --cc stack/core/pom.xml index ce5b67d,9c6497e..6c70342 --- a/stack/core/pom.xml +++ b/stack/core/pom.xml @@@ -17,30 -17,30 +17,31 @@@ --> <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.apache.usergrid</groupId> - <artifactId>usergrid</artifactId> - <version>2.2.0-SNAPSHOT</version> - <relativePath>../</relativePath> - </parent> - - <artifactId>usergrid-core</artifactId> - <name>Usergrid Core</name> - <description>Core services for Usergrid system.</description> - <packaging>jar</packaging> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - - <build> ++ + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.usergrid</groupId> + <artifactId>usergrid</artifactId> - <version>2.1.1-SNAPSHOT</version> ++ <version>2.2.0-SNAPSHOT</version> + <relativePath>../</relativePath> + </parent> + + <artifactId>usergrid-core</artifactId> + <name>Usergrid Core</name> + <description>Core services for Usergrid system.</description> + <packaging>jar</packaging> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + </plugins> + </reporting> + + + <build> <resources> <resource> @@@ -55,384 -55,395 +56,396 @@@ </includes> </resource> </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.yaml</include> - <include>**/*.properties</include> - <include>**/*.xml</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - <includes> - <include>largeentity.json</include> - </includes> - </testResource> - </testResources> - - <plugins> - - <!-- - Do not need to configure surefire plugin here, parent POM configuration is sufficient. - --> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>test-jar-execution</id> - <phase>package</phase> - <goals> - <goal>test-jar</goal> - </goals> - <configuration> - <includes> - <include>**/org/apache/usergrid/**</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> - - <dependencies> - - - <!-- dependent on wiring guice and spring --> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-spring</artifactId> - <version>4.0-beta5</version> - </dependency> - - <!-- Apache Dependencies --> - - <dependency> - <groupId>org.apache.cassandra</groupId> - <artifactId>cassandra-all</artifactId> - <!-- Exclude the old and problematic Snappy --> - <exclusions> - <exclusion> - <artifactId>snappy-java</artifactId> - <groupId>org.xerial.snappy</groupId> - </exclusion> - <exclusion> - <artifactId>antlr</artifactId> - <groupId>org.antlr</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.cassandra</groupId> - <artifactId>cassandra-thrift</artifactId> - </dependency> - - <!-- Include the slighly newer and less problematic snappy --> - <dependency> - <artifactId>snappy-java</artifactId> - <groupId>org.xerial.snappy</groupId> - <version>1.0.5</version> - </dependency> - - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <!-- SUN, Javax Package, and Other Commercial Dependencies --> - - <dependency> - <groupId>com.beust</groupId> - <artifactId>jcommander</artifactId> - </dependency> - - <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - </dependency> - - <dependency> - <groupId>com.fasterxml.uuid</groupId> - <artifactId>java-uuid-generator</artifactId> - </dependency> - - <dependency> - <groupId>com.hazelcast</groupId> - <artifactId>hazelcast-all</artifactId> - </dependency> - - <dependency> - <groupId>com.netflix.curator</groupId> - <artifactId>curator-recipes</artifactId> - </dependency> - - <dependency> - <groupId>com.netflix.astyanax</groupId> - <artifactId>astyanax-recipes</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <!-- Codehaus, Spring and Other Org Dependencies --> - - <dependency> - <groupId>org.hectorclient</groupId> - <artifactId>hector-core</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - </dependency> - - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - </dependency> - - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - </dependency> - - <dependency> - <groupId>org.jsoup</groupId> - <artifactId>jsoup</artifactId> - </dependency> - - <dependency> - <groupId>org.perf4j</groupId> - <artifactId>perf4j</artifactId> - </dependency> - - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - </dependency> - - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - </dependency> - - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - </dependency> - - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </dependency> - - <!-- Test and Logging Dependencies --> - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>usergrid-config</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <dependency> - <groupId>org.hectorclient</groupId> - <artifactId>hector-test</artifactId> - <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> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>usergrid-test-utils</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> - - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>common</artifactId> - <version>2.2.0-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - - <!-- Core Persistence deps --> - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>collection</artifactId> - <version>2.2.0-SNAPSHOT</version> - <type>jar</type> - <exclusions> - <exclusion> - <artifactId>antlr</artifactId> - <groupId>org.antlr</groupId> - </exclusion> - <exclusion> - <artifactId>antlr</artifactId> - <groupId>antlr</groupId> - </exclusion> - </exclusions> - </dependency> - - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>queryindex</artifactId> - <version>2.2.0-SNAPSHOT</version> - <type>jar</type> - </dependency> - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>graph</artifactId> - <version>2.2.0-SNAPSHOT</version> - <type>jar</type> - </dependency> - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>map</artifactId> - <version>2.2.0-SNAPSHOT</version> - <type>jar</type> - </dependency> - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>cache</artifactId> - <version>2.2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>queue</artifactId> - <version>2.2.0-SNAPSHOT</version> - <type>jar</type> - </dependency> - - <dependency> - <groupId>com.codahale.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>${metrics.version}</version> - </dependency> - - <dependency> - <groupId>com.codahale.metrics</groupId> - <artifactId>metrics-graphite</artifactId> - <version>${metrics.version}</version> - </dependency> - - </dependencies> - - <!-- - Do not need jacoco profile here because we do not override the surefire plugin in this POM - --> ++ + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.yaml</include> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>largeentity.json</include> + </includes> + </testResource> + </testResources> + + <plugins> + + <!-- + Do not need to configure surefire plugin here, parent POM configuration is sufficient. + --> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>test-jar-execution</id> + <phase>package</phase> + <goals> + <goal>test-jar</goal> + </goals> + <configuration> + <includes> + <include>**/org/apache/usergrid/**</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + + <dependencies> + + + <!-- dependent on wiring guice and spring --> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-spring</artifactId> + <version>4.0-beta5</version> + </dependency> + + <!-- Apache Dependencies --> + + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>cassandra-all</artifactId> + <!-- Exclude the old and problematic Snappy --> + <exclusions> + <exclusion> + <artifactId>snappy-java</artifactId> + <groupId>org.xerial.snappy</groupId> + </exclusion> + <exclusion> + <artifactId>antlr</artifactId> + <groupId>org.antlr</groupId> + </exclusion> + <exclusion> + <artifactId>netty</artifactId> + <groupId>io.netty</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>cassandra-thrift</artifactId> + </dependency> + + <!-- Include the slighly newer and less problematic snappy --> + <dependency> + <artifactId>snappy-java</artifactId> + <groupId>org.xerial.snappy</groupId> + <version>1.0.5</version> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <!-- SUN, Javax Package, and Other Commercial Dependencies --> + + <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + </dependency> + + <dependency> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + </dependency> + + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </dependency> + + <dependency> + <groupId>com.fasterxml.uuid</groupId> + <artifactId>java-uuid-generator</artifactId> + </dependency> + + <dependency> + <groupId>com.hazelcast</groupId> + <artifactId>hazelcast-all</artifactId> + </dependency> + + <dependency> + <groupId>com.netflix.curator</groupId> + <artifactId>curator-recipes</artifactId> + </dependency> + + <dependency> + <groupId>com.netflix.astyanax</groupId> + <artifactId>astyanax-recipes</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <!-- Codehaus, Spring and Other Org Dependencies --> + + <dependency> + <groupId>org.hectorclient</groupId> + <artifactId>hector-core</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </dependency> + + <dependency> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + </dependency> + + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + </dependency> + + <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + </dependency> + + <dependency> + <groupId>org.perf4j</groupId> + <artifactId>perf4j</artifactId> + </dependency> + + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + </dependency> + + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + </dependency> + + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + </dependency> + + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + </dependency> + + <!-- + <dependency> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </dependency> + --> + + <!-- Test and Logging Dependencies --> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>usergrid-config</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + + <dependency> + <groupId>org.hectorclient</groupId> + <artifactId>hector-test</artifactId> + <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> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>usergrid-test-utils</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <scope>test</scope> + </dependency> + + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>common</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + + <!-- Core Persistence deps --> + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>collection</artifactId> + <version>${project.version}</version> + <type>jar</type> + <exclusions> + <exclusion> + <artifactId>antlr</artifactId> + <groupId>org.antlr</groupId> + </exclusion> + <exclusion> + <artifactId>antlr</artifactId> + <groupId>antlr</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>queryindex</artifactId> + <version>${project.version}</version> + <type>jar</type> + </dependency> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>graph</artifactId> + <version>${project.version}</version> + <type>jar</type> + </dependency> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>map</artifactId> + <version>${project.version}</version> + <type>jar</type> + </dependency> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>cache</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>actorsystem</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>queue</artifactId> + <version>${project.version}</version> + <type>jar</type> + </dependency> + + <dependency> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>${metrics.version}</version> + </dependency> + + <dependency> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-graphite</artifactId> + <version>${metrics.version}</version> + </dependency> + + </dependencies> + + <!-- + Do not need jacoco profile here because we do not override the surefire plugin in this POM + --> </project> http://git-wip-us.apache.org/repos/asf/usergrid/blob/849df674/stack/corepersistence/collection/pom.xml ---------------------------------------------------------------------- diff --cc stack/corepersistence/collection/pom.xml index 2728fb4,88b96b1..20f8612 --- a/stack/corepersistence/collection/pom.xml +++ b/stack/corepersistence/collection/pom.xml @@@ -3,46 -19,88 +19,88 @@@ 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";> - <parent> - <artifactId>persistence</artifactId> - <groupId>org.apache.usergrid</groupId> - <version>2.2.0-SNAPSHOT</version> - </parent> + <parent> + <artifactId>persistence</artifactId> + <groupId>org.apache.usergrid</groupId> - <version>2.1.1-SNAPSHOT</version> ++ <version>2.2.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <description>The module for handling all scope I/O</description> + + <artifactId>collection</artifactId> + <name>Usergrid Collection</name> + + <dependencies> + + <!-- Google Guice Integration Test Injectors --> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>common</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>actorsystem</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-actor_2.11</artifactId> + <version>2.4.0</version> + </dependency> - <modelVersion>4.0.0</modelVersion> - <description>The module for handling all scope I/O</description> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-remote_2.11</artifactId> + <version>2.4.0</version> + </dependency> - <artifactId>collection</artifactId> - <name>Usergrid Collection</name> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-cluster_2.11</artifactId> + <version>2.4.0</version> + </dependency> - <dependencies> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-cluster-tools_2.11</artifactId> + <version>2.4.0</version> + </dependency> - <!-- Google Guice Integration Test Injectors --> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-cluster-metrics_2.11</artifactId> + <version>2.4.0</version> + </dependency> - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-slf4j_2.11</artifactId> + <version>2.4.0</version> + </dependency> - <!-- tests --> + <!-- tests --> - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>common</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> + </dependency> - </dependencies> + </dependencies> <!-- <profiles> http://git-wip-us.apache.org/repos/asf/usergrid/blob/849df674/stack/corepersistence/common/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/849df674/stack/corepersistence/model/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/849df674/stack/corepersistence/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/849df674/stack/corepersistence/queryindex/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/849df674/stack/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/849df674/stack/services/pom.xml ----------------------------------------------------------------------
