Merged #123 "Update to gson 2.2.2"

gitblit-org · Jul 2, 2014 · 1368b57 · 1368b57
2 parents 6c59a7f + a582f7e
commit 1368b57
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.classpath b/.classpath
@@ -55,7 +55,7 @@
 	<classpathentry kind="lib" path="ext/mina-core-2.0.7.jar" sourcepath="ext/src/mina-core-2.0.7.jar" />
 	<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
 	<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
-	<classpathentry kind="lib" path="ext/gson-1.7.2.jar" sourcepath="ext/src/gson-1.7.2.jar" />
+	<classpathentry kind="lib" path="ext/gson-2.2.2.jar" sourcepath="ext/src/gson-2.2.2.jar" />
 	<classpathentry kind="lib" path="ext/groovy-all-1.8.8.jar" sourcepath="ext/src/groovy-all-1.8.8.jar" />
 	<classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.0.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.0.jar" />
 	<classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0.jar" />

diff --git a/build.moxie b/build.moxie
@@ -159,7 +159,7 @@ dependencies:
 - compile 'org.apache.sshd:sshd-core:${sshd.version}' :war !org.easymock
 - compile 'org.apache.mina:mina-core:${mina.version}' :war !org.easymock
 - compile 'rome:rome:0.9' :war :manager :api
-- compile 'com.google.code.gson:gson:1.7.2' :war :fedclient :manager :api
+- compile 'com.google.code.gson:gson:2.2.2' :war :fedclient :manager :api
 - compile 'org.codehaus.groovy:groovy-all:${groovy.version}' :war
 - compile 'com.unboundid:unboundid-ldapsdk:2.3.0' :war
 - compile 'org.apache.ivy:ivy:2.2.0' :war

diff --git a/gitblit.iml b/gitblit.iml
@@ -562,13 +562,13 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="gson-1.7.2.jar">
+      <library name="gson-2.2.2.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/gson-1.7.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/gson-2.2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/gson-1.7.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/gson-2.2.2.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

diff --git a/releases.moxie b/releases.moxie
@@ -24,7 +24,8 @@ r25: {
     - Jetty 9.2.1 (pr-202)
     - Lucene 4.8.1 (pr-201)
     - JGit 3.4.0 (pr-200)
-    - SLF4j 1.7.7
+    - SLF4j 1.7.7 (ticket-122)
+    - gson 2.2.2 (ticket-123)
     contributors:
     - James Moger
     - David Ostrovsky