Merge pull request #1 from keyurkarnik/master Fixed failing tests and bugs
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/749a97f8 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/749a97f8 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/749a97f8 Branch: refs/heads/master Commit: 749a97f86e8f7470a73a90a0f6221a9dba9c4cf6 Parents: 1c3fbe4 faafed8 Author: keyurkarnik <42590775+keyurkar...@users.noreply.github.com> Authored: Wed Sep 5 00:35:13 2018 -0700 Committer: GitHub <nore...@github.com> Committed: Wed Sep 5 00:35:13 2018 -0700 ---------------------------------------------------------------------- .../corepersistence/index/ReIndexService.java | 2 +- .../index/ReIndexServiceImpl.java | 22 ++++---- .../usergrid/persistence/RebuildIndexTest.java | 57 ++++++++++++++++---- stack/pom.xml | 2 +- .../apache/usergrid/rest/IndexResourceIT.java | 45 +++++++++++----- .../org/apache/usergrid/NewOrgAppAdminRule.java | 1 + .../management/OrganizationConfigIT.java | 4 +- .../management/export/ExportServiceIT.java | 3 ++ 8 files changed, 98 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/749a97f8/stack/pom.xml ---------------------------------------------------------------------- diff --cc stack/pom.xml index 41ce5bf,aa289d0..438a6fd --- a/stack/pom.xml +++ b/stack/pom.xml @@@ -114,10 -114,10 +114,10 @@@ <junit-version>4.12</junit-version> <log4j-version>1.2.16</log4j-version> <org.springframework.version>3.2.13.RELEASE</org.springframework.version> - <shiro-version>1.2.4</shiro-version> + <shiro-version>1.3.2</shiro-version> <slf4j-version>1.7.2</slf4j-version> <snakeyaml-version>1.9</snakeyaml-version> - <tomcat-version>7.0.64</tomcat-version> + <tomcat-version>7.0.84</tomcat-version> <antlr.version>3.4</antlr.version> <tika.version>1.4</tika.version> <mockito.version>1.10.8</mockito.version>