diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-30 10:58:43 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-30 10:58:43 -0400 |
| commit | ecc298bc65dbe75793e8956d89ac3d1a25dddd91 (patch) | |
| tree | 7649ddaf3023ed71b7fb5aba2818d194f9d0f34d | |
| parent | 5759941c21e106c864a672ec4e5e4b10fa2310ed (diff) | |
| parent | af0c3c7e0191476cfee1f7129486801358548f72 (diff) | |
| download | gitblit-ecc298bc65dbe75793e8956d89ac3d1a25dddd91.tar.gz gitblit-ecc298bc65dbe75793e8956d89ac3d1a25dddd91.zip | |
Merge branch 'ticket/200' into develop
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | build.moxie | 2 | ||||
| -rw-r--r-- | gitblit.iml | 6 |
3 files changed, 5 insertions, 5 deletions
@@ -16,7 +16,7 @@ <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.7.jar" sourcepath="ext/src/slf4j-log4j12-1.7.7.jar" /> <classpathentry kind="lib" path="ext/javax.mail-1.5.1.jar" sourcepath="ext/src/javax.mail-1.5.1.jar" /> <classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" /> - <classpathentry kind="lib" path="ext/jetty-all-9.2.2.v20140723.jar" sourcepath="ext/src/jetty-all-9.2.2.v20140723.jar" /> + <classpathentry kind="lib" path="ext/jetty-all-9.2.3.v20140905.jar" sourcepath="ext/src/jetty-all-9.2.3.v20140905.jar" /> <classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" /> <classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" /> <classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" /> diff --git a/build.moxie b/build.moxie index 965ecde8..d0282003 100644 --- a/build.moxie +++ b/build.moxie @@ -102,7 +102,7 @@ repositories: central, eclipse-snapshots, eclipse, gitblit # Convenience properties for dependencies properties: { - jetty.version : 9.2.2.v20140723 + jetty.version : 9.2.3.v20140905 wicket.version : 1.4.21 lucene.version : 4.10.0 jgit.version : 3.5.0.201409260305-r diff --git a/gitblit.iml b/gitblit.iml index cfe8b542..759bf038 100644 --- a/gitblit.iml +++ b/gitblit.iml @@ -135,13 +135,13 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="jetty-all-9.2.2.v20140723.jar"> + <library name="jetty-all-9.2.3.v20140905.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.2.v20140723.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.3.v20140905.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.2.v20140723.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.3.v20140905.jar!/" /> </SOURCES> </library> </orderEntry> |