usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [11/50] [abbrv] usergrid git commit: bumped the tomcat version for compatibility with tomcat 8. Removed power mock as we only use mockito now Removed the AppleJavaExtensions since we removed the launcher as well. Added some comments on why some dependenc
Date Mon, 02 May 2016 17:54:42 GMT
bumped the tomcat version for compatibility with tomcat 8.
Removed power mock as we only use mockito now
Removed the AppleJavaExtensions since we removed the launcher as well.
Added some comments on why some dependencies were left in.
Removed the Cglib since we use other java byte code plugins
Removed nexflix curator since we don't use zookeeper in the code base anymore.
Also fixed a small call in the ToolBase for the tools since the call it used to make no longer
exists.


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

Branch: refs/heads/USERGRID-1246-MASTER
Commit: 325242e4a6eac2f9f54f7b8ea9def7e86e0df499
Parents: ab36dd3
Author: George Reyes <grey@apache.org>
Authored: Fri Apr 29 17:00:54 2016 -0700
Committer: George Reyes <grey@apache.org>
Committed: Fri Apr 29 17:00:54 2016 -0700

----------------------------------------------------------------------
 stack/core/pom.xml                              | 10 ----
 stack/pom.xml                                   | 59 ++------------------
 stack/services/pom.xml                          | 18 ------
 .../org/apache/usergrid/tools/ToolBase.java     | 17 +++---
 4 files changed, 14 insertions(+), 90 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/325242e4/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index 0a21f7a..8a56782 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -199,11 +199,6 @@
       <artifactId>java-uuid-generator</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.netflix.curator</groupId>
-      <artifactId>curator-recipes</artifactId>
-    </dependency>
-
       <dependency>
           <groupId>com.netflix.astyanax</groupId>
           <artifactId>astyanax-recipes</artifactId>
@@ -282,11 +277,6 @@
     </dependency>
 
     <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
     </dependency>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/325242e4/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 4204674..3df8aab 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -117,7 +117,7 @@
         <shiro-version>1.2.4</shiro-version>
         <slf4j-version>1.7.2</slf4j-version>
         <snakeyaml-version>1.9</snakeyaml-version>
-        <tomcat-version>7.0.64</tomcat-version>
+        <tomcat-version>8.5.0</tomcat-version>
         <antlr.version>3.4</antlr.version>
         <tika.version>1.4</tika.version>
         <mockito.version>1.10.8</mockito.version>
@@ -903,24 +903,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-module-junit4</artifactId>
-                <version>${powermock.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-module-junit4-rule-agent</artifactId>
-                <version>${powermock.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-api-mockito</artifactId>
-                <version>${powermock.version}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>${junit-version}</version>
@@ -1008,6 +990,8 @@
                 <version>2.3</version>
             </dependency>
 
+            <!--This is for the command line tools to hook in and use their stuff. It's
pretty small so i left-->
+            <!--it until we get rid of the tools directory.-->
             <dependency>
                 <groupId>com.beust</groupId>
                 <artifactId>jcommander</artifactId>
@@ -1021,13 +1005,6 @@
             </dependency>
 
             <dependency>
-                <groupId>com.apple</groupId>
-                <artifactId>AppleJavaExtensions</artifactId>
-                <!-- from local-depedendencies -->
-                <version>1.4</version>
-            </dependency>
-
-            <dependency>
                 <groupId>javax.annotation</groupId>
                 <artifactId>jsr250-api</artifactId>
                 <version>1.0</version>
@@ -1039,6 +1016,8 @@
                 <version>1.1.1</version>
             </dependency>
 
+            <!--Used for the trace aspect stuff in usergrid lower levels. Needs further
understanding
+            before removal.-->
             <dependency>
                 <groupId>org.aspectj</groupId>
                 <artifactId>aspectjweaver</artifactId>
@@ -1052,34 +1031,6 @@
             </dependency>
 
             <dependency>
-                <groupId>cglib</groupId>
-                <artifactId>cglib-nodep</artifactId>
-                <version>2.2.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.netflix.curator</groupId>
-                <artifactId>curator-recipes</artifactId>
-                <version>1.2.6</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.google.guava</groupId>
-                        <artifactId>guava</artifactId>
-                    </exclusion>
-
-                    <exclusion>
-                        <groupId>org.apache.zookeeper</groupId>
-                        <artifactId>zookeeper</artifactId>
-                    </exclusion>
-
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
                 <groupId>javax.activation</groupId>
                 <artifactId>activation</artifactId>
                 <version>1.1</version>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/325242e4/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 823abf5..b3f75fc 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -331,24 +331,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4-rule-agent</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.hectorclient</groupId>
             <artifactId>hector-test</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/325242e4/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
index 9725dda..73c8821 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
@@ -19,18 +19,12 @@ package org.apache.usergrid.tools;
 
 import java.util.Properties;
 
-import org.apache.usergrid.corepersistence.CpEntityManagerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.apache.usergrid.management.ManagementService;
-import org.apache.usergrid.persistence.EntityManagerFactory;
-import org.apache.usergrid.persistence.cassandra.CassandraService;
-import org.apache.usergrid.persistence.cassandra.Setup;
-import org.apache.usergrid.services.ServiceManagerFactory;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -42,11 +36,18 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.lang.ClassUtils;
 
+import org.apache.usergrid.corepersistence.CpEntityManagerFactory;
+import org.apache.usergrid.management.ManagementService;
+import org.apache.usergrid.persistence.EntityManagerFactory;
+import org.apache.usergrid.persistence.cassandra.CassandraService;
+import org.apache.usergrid.persistence.cassandra.Setup;
+import org.apache.usergrid.services.ServiceManagerFactory;
+
 import me.prettyprint.hector.testutils.EmbeddedServerHelper;
 
+import static org.apache.usergrid.utils.JsonUtils.mapToFormattedJsonString;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.apache.usergrid.utils.JsonUtils.mapToFormattedJsonString;
 
 
 /**
@@ -194,7 +195,7 @@ public abstract class ToolBase {
 
         Setup setup = ( (CpEntityManagerFactory) emf ).getSetup();
         logger.info( "Setting up Usergrid schema" );
-        setup.initSubsystems();
+        setup.initSchema();
         logger.info( "Usergrid schema setup" );
 
         logger.info( "Setting up Usergrid management services" );


Mime
View raw message