Use escape-by-default patched stapler from Hudson@Eclipse

mcculls · Apr 16, 2012 · a4bf322 · a4bf322
1 parent 8ab13dc
commit a4bf322
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/hudson-core/pom.xml b/hudson-core/pom.xml
@@ -45,7 +45,7 @@ THE SOFTWARE.
     <jtidy.version>r938</jtidy.version>
     <jna-posix.version>1.0.3</jna-posix.version>
     <trilead-putty-extension.version>1.0</trilead-putty-extension.version>
-    <stapler-jelly.version>1.167</stapler-jelly.version>
+    <stapler-jelly.version>3.0.0-SNAPSHOT</stapler-jelly.version>
     <bridge-method-annotation.version>1.4</bridge-method-annotation.version>
     <json-lib.version>2.4</json-lib.version>
     <annotation-indexer.version>1.2</annotation-indexer.version>
@@ -413,7 +413,7 @@ THE SOFTWARE.
       <version>${trilead-putty-extension.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.kohsuke.stapler</groupId>
+      <groupId>org.eclipse.hudson.stapler</groupId>
       <artifactId>stapler-jelly</artifactId>
       <version>${stapler-jelly.version}</version>
       <exclusions>

diff --git a/hudson-core/src/main/java/hudson/model/Api.java b/hudson-core/src/main/java/hudson/model/Api.java
@@ -187,12 +187,5 @@ public void doJson(StaplerRequest req, StaplerResponse rsp) throws IOException,
         rsp.serveExposedBean(req,bean, Flavor.JSON);
     }
 
-    /**
-     * Exposes the bean as Python literal.
-     */
-    public void doPython(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
-        rsp.serveExposedBean(req,bean, Flavor.PYTHON);
-    }
-
     private static final ModelBuilder MODEL_BUILDER = new ModelBuilder();
 }
diff --git a/hudson-service/src/main/java/org/hudsonci/service/internal/DummyStaplerRequest.java b/hudson-service/src/main/java/org/hudsonci/service/internal/DummyStaplerRequest.java
@@ -27,7 +27,6 @@
 import net.sf.json.JSONObject;
 import org.apache.commons.fileupload.FileItem;
 import org.kohsuke.stapler.Ancestor;
-import org.kohsuke.stapler.BindInterceptor;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
@@ -402,14 +401,6 @@ public WebApp getWebApp() {
         return null;
     }
 
-    public BindInterceptor getBindInterceptor() {
-        return null;
-    }
-
-    public BindInterceptor setBindListener(BindInterceptor bindInterceptor) {
-        return null;
-    }
-
     public BoundObjectTable getBoundObjectTable() {
         return null;
     }