diff options
author | James Moger <james.moger@gitblit.com> | 2014-07-02 15:43:48 -0600 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2014-07-02 15:43:48 -0600 |
commit | 1368b57d777d05a78badfb397379063856d7295a (patch) | |
tree | 8de2131c4ec1947d97afd2662871818e829ea019 | |
parent | 6c59a7f19fff3e24b738825ebb8659e6c260d5eb (diff) | |
parent | a582f7eebc6a12aefd203a1bdecbe06b10bd9d9b (diff) | |
download | gitblit-1368b57d777d05a78badfb397379063856d7295a.tar.gz gitblit-1368b57d777d05a78badfb397379063856d7295a.zip |
Merged #123 "Update to gson 2.2.2"
-rw-r--r-- | .classpath | 2 | ||||
-rw-r--r-- | build.moxie | 2 | ||||
-rw-r--r-- | gitblit.iml | 6 | ||||
-rw-r--r-- | releases.moxie | 3 |
4 files changed, 7 insertions, 6 deletions
@@ -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 index 9a4830b6..a0a8d4c3 100644 --- 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 index 99c91cc5..ca8925bd 100644 --- 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 index 89b1a50c..e2b614c0 100644 --- 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 |