You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/27 22:21:16 UTC

[02/50] [abbrv] git commit: Change version to 2.0.0-SNAPSHOT so modules do not conflict with old Usergrid modules in the repo.

Change version to 2.0.0-SNAPSHOT so modules do not conflict with old Usergrid modules in the repo.


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

Branch: refs/pull/77/head
Commit: 8043bf321f58bb221ce115070dd2bb786447ebc1
Parents: e7d8ece
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Mar 25 12:40:31 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Mar 25 12:40:31 2014 -0400

----------------------------------------------------------------------
 stack/build-tools/pom.xml               | 2 +-
 stack/config/pom.xml                    | 2 +-
 stack/core/pom.xml                      | 2 +-
 stack/corepersistence/perftest1/pom.xml | 6 +++---
 stack/launcher/pom.xml                  | 2 +-
 stack/mongo-emulator/pom.xml            | 2 +-
 stack/pom.xml                           | 9 ++++++---
 stack/query-validator/pom.xml           | 2 +-
 stack/rest/pom.xml                      | 4 ++--
 stack/services/pom.xml                  | 2 +-
 stack/test-utils/pom.xml                | 2 +-
 stack/tools/pom.xml                     | 4 ++--
 stack/websocket/pom.xml                 | 2 +-
 13 files changed, 22 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/stack/build-tools/pom.xml b/stack/build-tools/pom.xml
index 83d4ffe..fdd152b 100644
--- a/stack/build-tools/pom.xml
+++ b/stack/build-tools/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.29-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>build-tools</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/config/pom.xml
----------------------------------------------------------------------
diff --git a/stack/config/pom.xml b/stack/config/pom.xml
index 16cd0ee..249b91b 100644
--- a/stack/config/pom.xml
+++ b/stack/config/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.29-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>usergrid-config</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index dad4a6b..7088e40 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.29-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <properties>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/corepersistence/perftest1/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/perftest1/pom.xml b/stack/corepersistence/perftest1/pom.xml
index 0307bde..64e76f7 100644
--- a/stack/corepersistence/perftest1/pom.xml
+++ b/stack/corepersistence/perftest1/pom.xml
@@ -20,20 +20,20 @@
         <dependency>
             <groupId>org.apache.usergrid</groupId>
             <artifactId>usergrid-core</artifactId>
-            <version>0.0.29-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
             <type>jar</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.usergrid</groupId>
             <artifactId>usergrid-test-utils</artifactId>
-            <version>0.0.29-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.usergrid</groupId>
             <artifactId>usergrid-tools</artifactId>
-            <version>0.0.29-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>test</scope>
             <type>jar</type>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/stack/launcher/pom.xml b/stack/launcher/pom.xml
index 9132aa0..56ad912 100644
--- a/stack/launcher/pom.xml
+++ b/stack/launcher/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.29-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>usergrid-launcher</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/mongo-emulator/pom.xml
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/pom.xml b/stack/mongo-emulator/pom.xml
index 7592654..79e278e 100644
--- a/stack/mongo-emulator/pom.xml
+++ b/stack/mongo-emulator/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.29-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>usergrid-mongo-emulator</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index a02adfb..55f5059 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -27,7 +27,7 @@
 
   <groupId>org.apache.usergrid</groupId>
   <artifactId>usergrid</artifactId>
-  <version>0.0.29-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>Usergrid Parent</name>
   <description>Usergrid Project</description>
   <packaging>pom</packaging>
@@ -1769,6 +1769,7 @@
                     <exclude>**/README.md</exclude>
                     <exclude>**/CHANGES.txt</exclude>
                     <exclude>**/*.json</exclude>
+                    <exclude>**/*.properties</exclude>
 
                     <!-- git and IDE project files -->
                     <exclude>**/.git/**</exclude>
@@ -1796,9 +1797,11 @@
                     <!-- other -->
                     <exclude>**/m2/**</exclude>
                     <exclude>**/*.asc</exclude>
-                    <exclude>**/src/test/resources/**</exclude>
                     <exclude>**/cloudbees.xml</exclude>
-                    <exclude>**/aws.properties</exclude>
+
+                    <exclude>**/src/test/resources/**</exclude>
+                    <exclude>**/src/main/dist/lib/**</exclude>
+                    <exclude>**/src/main/dist/webapps/**</exclude>
 
                     <!-- TODO: need to add headers to many files in corepersistence -->
                     <exclude>**/corepersistence/**</exclude>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/query-validator/pom.xml
----------------------------------------------------------------------
diff --git a/stack/query-validator/pom.xml b/stack/query-validator/pom.xml
index ec37b93..ec04eda 100644
--- a/stack/query-validator/pom.xml
+++ b/stack/query-validator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.usergrid</groupId>
         <artifactId>usergrid</artifactId>
-        <version>0.0.29-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 90311e5..e9cd2e0 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.29-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>usergrid-rest</artifactId>
@@ -586,7 +586,7 @@
     <dependency>
       <groupId>org.apache.usergrid</groupId>
       <artifactId>usergrid-services</artifactId>
-      <version>0.0.29-SNAPSHOT</version>
+      <version>2.0.0-SNAPSHOT</version>
       <scope>test</scope>
       <classifier>tests</classifier>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 4c9f802..8d0126a 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.29-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <!-- Override these properties in your settings.xml in an active profile -->

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index 4be950b..d2f729b 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.29-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>usergrid-test-utils</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/tools/pom.xml
----------------------------------------------------------------------
diff --git a/stack/tools/pom.xml b/stack/tools/pom.xml
index 062dcf7..7c002c0 100644
--- a/stack/tools/pom.xml
+++ b/stack/tools/pom.xml
@@ -21,14 +21,14 @@
   <parent>
     <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.29-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>usergrid-tools</artifactId>
   <name>Usergrid Tools</name>
   <description>Command line tools for Usergrid system.</description>
   <packaging>jar</packaging>
-  <version>0.0.29-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
 
   <reporting>
     <plugins>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8043bf32/stack/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/stack/websocket/pom.xml b/stack/websocket/pom.xml
index 665ba18..e26de6e 100644
--- a/stack/websocket/pom.xml
+++ b/stack/websocket/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.29-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>usergrid-websocket</artifactId>