summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-07-21 14:48:15 -0400
committerJames Moger <james.moger@gitblit.com>2011-07-21 14:48:15 -0400
commit0d3e3ca5b85d7e81066030a5081ea3a9cbe76607 (patch)
tree6cc112fdfbef67dc1c812df5c7fd6b549f5323df
parent5c563c00fb5a5098542fef8c942447a0a0f39dcd (diff)
downloadgitblit-0d3e3ca5b85d7e81066030a5081ea3a9cbe76607.tar.gz
gitblit-0d3e3ca5b85d7e81066030a5081ea3a9cbe76607.zip
Rollback to Jetty 7.4.3 for now.
Jetty 7.4.4 introduces a fix to correct url generation. Unfortunately, this "fix" creates a bug for resolving the root page. Evidently the bug may really be in Wicket. Wicket Bug: WICKET-3841 Eclipse Bug: 351199
-rw-r--r--.classpath4
-rw-r--r--docs/00_index.mkd2
-rw-r--r--docs/04_releases.mkd2
-rw-r--r--src/com/gitblit/build/Build.java8
4 files changed, 8 insertions, 8 deletions
diff --git a/.classpath b/.classpath
index e0ed2cd6..b4693ca7 100644
--- a/.classpath
+++ b/.classpath
@@ -86,9 +86,9 @@
<attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/markdownpapers-core-1.1.0-javadoc.jar!/"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="ext/jetty-webapp-7.4.4.v20110707.jar" sourcepath="ext/jetty-webapp-7.4.4.v20110707-sources.jar">
+ <classpathentry kind="lib" path="ext/jetty-webapp-7.4.3.v20110701.jar" sourcepath="ext/jetty-webapp-7.4.3.v20110701-sources.jar">
<attributes>
- <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/jetty-webapp-7.4.4.v20110707-javadoc.jar!/"/>
+ <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/jetty-webapp-7.4.3.v20110701-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/>
diff --git a/docs/00_index.mkd b/docs/00_index.mkd
index efbfe0c8..2be3b061 100644
--- a/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@ -32,7 +32,7 @@ Gitblit requires a Java 6 Runtime Environment (JRE) or a Java 6 Development Kit
- fixed: tone-down repository group header color
- added: optionally display repository on-disk size on repositories page<br/>**New:** *web.showRepositorySizes = true*
- updated: MarkdownPapers 1.1.0
-- updated: Jetty 7.4.4
+- updated: Jetty 7.4.3
issues & binaries @ [Google Code][googlecode]<br/>
sources @ [Github][gitbltsrc]
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 91ff2c02..fee98c13 100644
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -12,7 +12,7 @@
- fixed: tone-down repository group header color
- added: optionally display repository on-disk size on repositories page<br/>**New:** *web.showRepositorySizes = true*
- updated: MarkdownPapers 1.1.0
-- updated: Jetty 7.4.4
+- updated: Jetty 7.4.3
### Older Releases
**0.5.1** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.1.zip)|[war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.1.war)) based on [JGit 1.0.0 (201106090707-r)][jgit] &nbsp; *released 2006-06-28*
diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index 35d549f9..22d61b5c 100644
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -329,10 +329,10 @@ public class Build {
"c7adc475ca40c288c93054e0f4fe58f3a98c0cb5");
public static final MavenObject JETTY = new MavenObject("Jetty",
- "org/eclipse/jetty/aggregate", "jetty-webapp", "7.4.4.v20110707", 1010000, 687000,
- 2760000, "bbf086d31f24aba5a871389e478b88a83ff728cd",
- "2904d8da6769d801f386dba285e17a87bc7bb69f",
- "35d4b4db0a016eabe8c95b187074f0a5761416f2");
+ "org/eclipse/jetty/aggregate", "jetty-webapp", "7.4.3.v20110701", 1000000, 680000,
+ 2720000, "bde072b178f9650e2308f0babe58a4baaa469e3c",
+ "bc75f05dd4f7fa848720ac669b8b438ee4a6b146",
+ "dcd42f672e734521d1a6ccc0c2f9ecded1a1a281");
public static final MavenObject SERVLET = new MavenObject("Servlet 2.5", "javax/servlet",
"servlet-api", "2.5", 105000, 158000, 0,