Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > be2ce40792b2db22533a1b1b95379a11 > files > 1

shrinkwrap-resolver-1.0.0-0.2.beta7.3.mga3.src.rpm

From 2b28a090d2aa55823045ea58a62964babeb0ebaf Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann@fedoraproject.org>
Date: Thu, 7 Jun 2012 12:21:19 +0200
Subject: [PATCH 1/2] Add support for jetty 8

---
 impl-maven/pom.xml                                          |    6 +++---
 .../resolver/impl/maven/OfflineRepositoryTestCase.java      |   11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/impl-maven/pom.xml b/impl-maven/pom.xml
index 873dc42..cb1944b 100644
--- a/impl-maven/pom.xml
+++ b/impl-maven/pom.xml
@@ -65,9 +65,9 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.mortbay.jetty</groupId>
-         <artifactId>jetty</artifactId>
-         <version>6.1.16</version>
+         <groupId>org.eclipse.jetty</groupId>
+         <artifactId>jetty-server</artifactId>
+         <version>8.1.2.v20120308</version>
          <scope>test</scope>
       </dependency>
 
diff --git a/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/OfflineRepositoryTestCase.java b/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/OfflineRepositoryTestCase.java
index 22eaf0a..1a824bd 100644
--- a/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/OfflineRepositoryTestCase.java
+++ b/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/OfflineRepositoryTestCase.java
@@ -37,9 +37,10 @@ import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
 import org.jboss.shrinkwrap.resolver.api.ResolutionException;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
 import org.junit.Test;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.AbstractHandler;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AbstractHandler;
 
 /**
  * Tests resolution of the artifacts without enabling any remote repository
@@ -202,8 +203,8 @@ public class OfflineRepositoryTestCase
        * javax.servlet.http.HttpServletResponse, int)
        */
       @Override
-      public void handle(final String target, final HttpServletRequest request, final HttpServletResponse response,
-               final int dispatch) throws IOException, ServletException
+      public void handle(final String target, final Request baseRequest, final HttpServletRequest request,
+               final HttpServletResponse response) throws IOException, ServletException
       {
          // Set content type and status before we write anything to the stream
          response.setContentType("text/xml");
-- 
1.7.10.2