incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1327745 - in /incubator/lcf/branches/CONNECTORS-459: ./ framework/jetty-runner/ framework/pull-agent/ framework/ui-core/ tests/alfresco/ tests/cmis/ tests/elasticsearch/ tests/filesystem/ tests/rss/ tests/wiki/
Date Wed, 18 Apr 2012 23:52:20 GMT
Author: kwright
Date: Wed Apr 18 23:52:19 2012
New Revision: 1327745

URL: http://svn.apache.org/viewvc?rev=1327745&view=rev
Log:
Modify poms to use jetty 7

Modified:
    incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/pom.xml
    incubator/lcf/branches/CONNECTORS-459/framework/pull-agent/pom.xml
    incubator/lcf/branches/CONNECTORS-459/framework/ui-core/pom.xml
    incubator/lcf/branches/CONNECTORS-459/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/alfresco/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/cmis/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/elasticsearch/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/filesystem/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/rss/pom.xml
    incubator/lcf/branches/CONNECTORS-459/tests/wiki/pom.xml

Modified: incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/pom.xml?rev=1327745&r1=1327744&r2=1327745&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/pom.xml Wed Apr 18 23:52:19
2012
@@ -210,24 +210,60 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1-glassfish</artifactId>
+      <version>${glassfish.version}</version>
+    </dependency>    
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
     </dependency>
 
     <!-- databases -->

Modified: incubator/lcf/branches/CONNECTORS-459/framework/pull-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/framework/pull-agent/pom.xml?rev=1327745&r1=1327744&r2=1327745&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/framework/pull-agent/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/framework/pull-agent/pom.xml Wed Apr 18 23:52:19
2012
@@ -75,29 +75,62 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-      <scope>test</scope>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
-      <scope>test</scope>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1-glassfish</artifactId>
+      <version>${glassfish.version}</version>
+    </dependency>    
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>${jsp-2.1-glassfish.version}</version>
-      <scope>test</scope>
+      <version>${glassfish.version}</version>
     </dependency>
 
     <dependency>

Modified: incubator/lcf/branches/CONNECTORS-459/framework/ui-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/framework/ui-core/pom.xml?rev=1327745&r1=1327744&r2=1327745&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/framework/ui-core/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/framework/ui-core/pom.xml Wed Apr 18 23:52:19 2012
@@ -69,9 +69,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-glassfish</artifactId>
+      <version>${glassfish.version}</version>
       <scope>provided</scope>
     </dependency>
 

Modified: incubator/lcf/branches/CONNECTORS-459/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/pom.xml?rev=1327745&r1=1327744&r2=1327745&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/pom.xml Wed Apr 18 23:52:19 2012
@@ -56,9 +56,7 @@
     <jtds.version>1.2.4</jtds.version>
     <servlet-api.version>2.5</servlet-api.version>
     <jstl.version>1.2</jstl.version>
-    <jsp-api-2.1.version>6.1.14</jsp-api-2.1.version>
-    <jsp-api.version>2.1</jsp-api.version>
-    <jsp-2.1-glassfish.version>2.1.v20091210</jsp-2.1-glassfish.version>
+    <glassfish.version>2.1.v20091210</glassfish.version>
     <log4j.version>1.2.16</log4j.version>
     <jdbcpool.version>0.99</jdbcpool.version>
     <json.version>20090211</json.version>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/alfresco/pom.xml?rev=1327745&r1=1327744&r2=1327745&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/alfresco/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/alfresco/pom.xml Wed Apr 18 23:52:19 2012
@@ -194,36 +194,64 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-naming</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-    	<groupId>org.mortbay.jetty</groupId>
-    	<artifactId>jetty-plus</artifactId>
-    	<version>${jetty.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1-glassfish</artifactId>
+      <version>${glassfish.version}</version>
+    </dependency>    
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
     </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/cmis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/cmis/pom.xml?rev=1327745&r1=1327744&r2=1327745&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/cmis/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/cmis/pom.xml Wed Apr 18 23:52:19 2012
@@ -188,26 +188,64 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1-glassfish</artifactId>
+      <version>${glassfish.version}</version>
+    </dependency>    
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
     </dependency>
+    
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/elasticsearch/pom.xml?rev=1327745&r1=1327744&r2=1327745&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/elasticsearch/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/elasticsearch/pom.xml Wed Apr 18 23:52:19
2012
@@ -203,26 +203,64 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1-glassfish</artifactId>
+      <version>${glassfish.version}</version>
+    </dependency>    
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
     </dependency>
+    
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/filesystem/pom.xml?rev=1327745&r1=1327744&r2=1327745&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/filesystem/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/filesystem/pom.xml Wed Apr 18 23:52:19 2012
@@ -159,26 +159,64 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1-glassfish</artifactId>
+      <version>${glassfish.version}</version>
+    </dependency>    
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
     </dependency>
+  
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/rss/pom.xml?rev=1327745&r1=1327744&r2=1327745&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/rss/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/rss/pom.xml Wed Apr 18 23:52:19 2012
@@ -153,26 +153,64 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1-glassfish</artifactId>
+      <version>${glassfish.version}</version>
+    </dependency>    
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
     </dependency>
+    
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/wiki/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/wiki/pom.xml?rev=1327745&r1=1327744&r2=1327745&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/wiki/pom.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/wiki/pom.xml Wed Apr 18 23:52:19 2012
@@ -154,26 +154,64 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-api-2.1</artifactId>
-      <version>${jsp-api-2.1.version}</version>
-    </dependency>    
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>${jsp-api.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1-glassfish</artifactId>
+      <version>${glassfish.version}</version>
+    </dependency>    
+    <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>${jsp-2.1-glassfish.version}</version>
+      <version>${glassfish.version}</version>
     </dependency>
+
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>



Mime
View raw message