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/01/21 19:20:24 UTC

[1/2] git commit: Support Java7 on Mac

Updated Branches:
  refs/heads/two-dot-o 8773a1833 -> 53e2ade8e
  refs/pull/33/merge [deleted] 96f983ff4


Support Java7 on Mac


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

Branch: refs/heads/two-dot-o
Commit: ff011d8f42e6ba8547e76e542de532cdc72dcb18
Parents: 8773a18
Author: Sungju Jin <su...@softwaregeeks.org>
Authored: Tue Jan 21 21:26:27 2014 +0900
Committer: Sungju Jin <su...@softwaregeeks.org>
Committed: Tue Jan 21 21:26:27 2014 +0900

----------------------------------------------------------------------
 stack/rest/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ff011d8f/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 1629dd3..14c4565 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -271,9 +271,9 @@
       </plugin>
 
       <plugin>
-        <groupId>org.codehaus.mojo.jspc</groupId>
+        <groupId>org.jasig.mojo.jspc</groupId>
         <artifactId>jspc-maven-plugin</artifactId>
-        <version>2.0-alpha-3</version>
+        <version>2.0.0</version>
         <configuration>
           <includeInProject>false</includeInProject>
           <webFragmentFile>${project.build.directory}/web-fragment.xml.txt</webFragmentFile>
@@ -288,9 +288,9 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>org.codehaus.mojo.jspc</groupId>
+            <groupId>org.jasig.mojo.jspc</groupId>
             <artifactId>jspc-compiler-tomcat6</artifactId>
-            <version>2.0-alpha-3</version>
+            <version>2.0.0</version>
           </dependency>
         </dependencies>
       </plugin>


[2/2] git commit: Merge pull request #33 from sungjuly/USERGRID-14

Posted by sn...@apache.org.
Merge pull request #33 from sungjuly/USERGRID-14

Support Java7 on Mac

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

Branch: refs/heads/two-dot-o
Commit: 53e2ade8e9572ccce35126923330136de22c187c
Parents: 8773a18 ff011d8
Author: tonuquq <to...@gmail.com>
Authored: Tue Jan 21 09:39:54 2014 -0800
Committer: tonuquq <to...@gmail.com>
Committed: Tue Jan 21 09:39:54 2014 -0800

----------------------------------------------------------------------
 stack/rest/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------