From 9c5719c22a673c34e75f3b46513ae01ba96691fd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 27 Apr 2012 17:29:01 -0400
Subject: [PATCH] Change servlet API dependency from Glassfish to official javax.servlet
---
.classpath | 2 +-
src/com/gitblit/build/Build.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.classpath b/.classpath
index 128dd59..3a3fc0a 100644
--- a/.classpath
+++ b/.classpath
@@ -18,7 +18,7 @@
<classpathentry kind="lib" path="ext/gson-1.7.1.jar" sourcepath="ext/gson-1.7.1-sources.jar"/>
<classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/mail-1.4.3-sources.jar"/>
<classpathentry kind="lib" path="ext/googlecharts-1.4.20.jar" sourcepath="ext/googlecharts-1.4.20-sources.jar"/>
- <classpathentry kind="lib" path="ext/javax.servlet-3.0.1.jar" sourcepath="ext/javax.servlet-3.0.1-sources.jar"/>
+ <classpathentry kind="lib" path="ext/javax.servlet-api-3.0.1.jar" sourcepath="ext/javax.servlet-api-3.0.1-sources.jar"/>
<classpathentry kind="lib" path="ext/wicket-1.4.20.jar" sourcepath="ext/wicket-1.4.20-sources.jar"/>
<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.20.jar" sourcepath="ext/wicket-auth-roles-1.4.20-sources.jar"/>
<classpathentry kind="lib" path="ext/wicket-extensions-1.4.20.jar" sourcepath="ext/wicket-extensions-1.4.20-sources.jar"/>
diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index 024b3ac..42f6704 100644
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -473,11 +473,11 @@
public static final MavenObject JETTY_AJP = new MavenObject("Jetty-AJP",
"org/eclipse/jetty", "jetty-ajp", "7.4.3.v20110701", 32000, 22000,
97000, "ddeb533bcf29e9b95555a9c0f34c1de3ab14c430", "bc4798286d705ea972643b3a0b31f46a0c53f605", "");
-
- public static final MavenObject SERVLET = new MavenObject("Servlet 3.0", "org/glassfish",
- "javax.servlet", "3.0.1", 84000, 211000, 0,
- "58f17c941cd0607bb5edcbcafc491d02265ac9a1",
- "63f2f8bcdd3f138020bbadd5c847e8f3847b77d2", null);
+
+ public static final MavenObject SERVLET = new MavenObject("Servlet 3.0", "javax/servlet",
+ "javax.servlet-api", "3.0.1", 84000, 211000, 0,
+ "6bf0ebb7efd993e222fc1112377b5e92a13b38dd",
+ "01952f91d84016a39e31346c9d18bd8c9c4a128a", null);
public static final MavenObject SLF4JAPI = new MavenObject("SLF4J API", "org/slf4j",
"slf4j-api", "1.6.1", 25500, 45000, 182000,
--
Gitblit v1.9.1