Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

ARQ-990 Update dependencies to match Fedora downstream repository

* move to jboss-spec ejb api
* move to new eclipse jetty
* exclude weld build poms
  • Loading branch information...
commit a022b627b3734c4f3b134644d862a479e85d0a70 1 parent d469157
Aslak Knutsen authored June 08, 2012
11  build/pom.xml
... ...
@@ -1,6 +1,7 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!-- vi:ts=2:sw=2:expandtab: -->
3  
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  3
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4 5
 
5 6
     <!-- Parent -->
6 7
     <parent>
@@ -24,8 +25,6 @@
24 25
 
25 26
         <!-- Arquillian Core common Deps, Test related -->
26 27
         <version.javax.inject_javax.inject>1</version.javax.inject_javax.inject>
27  
-        <version.jboss_logging>2.1.0.GA</version.jboss_logging>
28  
-        <version.jetty_jetty>6.1.9</version.jetty_jetty>
29 28
         <version.junit_junit>4.8.1</version.junit_junit>
30 29
         <version.mockito_all>1.8.3</version.mockito_all>
31 30
         <version.testng_testng>5.14.6</version.testng_testng>
@@ -70,12 +69,6 @@
70 69
             </dependency>
71 70
 
72 71
             <dependency>
73  
-                <groupId>org.mortbay.jetty</groupId>
74  
-                <artifactId>jetty-embedded</artifactId>
75  
-                <version>${version.jetty_jetty}</version>
76  
-                <scope>test</scope>
77  
-            </dependency>
78  
-            <dependency>
79 72
                 <groupId>org.mockito</groupId>
80 73
                 <artifactId>mockito-all</artifactId>
81 74
                 <version>${version.mockito_all}</version>
15  protocols/servlet/pom.xml
... ...
@@ -1,5 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2  
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  2
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  3
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3 4
 
4 5
     <!-- Parent -->
5 6
     <parent>
@@ -22,6 +23,7 @@
22 23
     <properties>
23 24
 
24 25
         <!-- Versioning -->
  26
+        <version.jetty_jetty>8.1.2.v20120308</version.jetty_jetty>
25 27
 
26 28
     </properties>
27 29
 
@@ -70,8 +72,15 @@
70 72
             <scope>test</scope>
71 73
         </dependency>
72 74
         <dependency>
73  
-            <groupId>org.mortbay.jetty</groupId>
74  
-            <artifactId>jetty-embedded</artifactId>
  75
+            <groupId>org.eclipse.jetty</groupId>
  76
+            <artifactId>jetty-server</artifactId>
  77
+            <version>${version.jetty_jetty}</version>
  78
+            <scope>test</scope>
  79
+        </dependency>
  80
+        <dependency>
  81
+            <groupId>org.eclipse.jetty</groupId>
  82
+            <artifactId>jetty-servlet</artifactId>
  83
+            <version>${version.jetty_jetty}</version>
75 84
             <scope>test</scope>
76 85
         </dependency>
77 86
     </dependencies>
9  protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/AbstractServerBase.java
@@ -25,6 +25,8 @@
25 25
 import java.util.Collection;
26 26
 import java.util.List;
27 27
 
  28
+import org.eclipse.jetty.server.Server;
  29
+import org.eclipse.jetty.servlet.ServletContextHandler;
28 30
 import org.jboss.arquillian.container.spi.client.protocol.metadata.HTTPContext;
29 31
 import org.jboss.arquillian.container.spi.client.protocol.metadata.Servlet;
30 32
 import org.jboss.arquillian.protocol.servlet.runner.ServletTestRunner;
@@ -32,8 +34,6 @@
32 34
 import org.jboss.arquillian.test.spi.TestMethodExecutor;
33 35
 import org.junit.After;
34 36
 import org.junit.Before;
35  
-import org.mortbay.jetty.Server;
36  
-import org.mortbay.jetty.servlet.Context;
37 37
 
38 38
 /**
39 39
  * AbstractServerBase
@@ -49,8 +49,11 @@
49 49
    public void setup() throws Exception
50 50
    {
51 51
       server = new Server(8181);
52  
-      Context root = new Context(server, "/arquillian-protocol", Context.SESSIONS);
  52
+
  53
+      ServletContextHandler root = new ServletContextHandler(ServletContextHandler.SESSIONS);
  54
+      root.setContextPath("/arquillian-protocol");
53 55
       root.addServlet(ServletTestRunner.class, ServletMethodExecutor.ARQUILLIAN_SERVLET_MAPPING);
  56
+      server.setHandler(root);
54 57
       server.start();
55 58
    }
56 59
 
10  testenrichers/cdi/pom.xml
... ...
@@ -1,5 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2  
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  2
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  3
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3 4
 
4 5
     <!-- Parent -->
5 6
     <parent>
@@ -98,6 +99,13 @@
98 99
             <artifactId>weld-core</artifactId>
99 100
             <version>${version.weld-core}</version>
100 101
             <scope>test</scope>
  102
+            <!-- ARQ-990 Removed, not needed runtime and not part of Fedora Maven Packages -->
  103
+            <exclusions>
  104
+                <exclusion>
  105
+                    <groupId>org.jboss.weld</groupId>
  106
+                    <artifactId>weld-build-config</artifactId>
  107
+                </exclusion>
  108
+            </exclusions>
101 109
         </dependency>
102 110
         <dependency>
103 111
             <groupId>org.slf4j</groupId>
10  testenrichers/ejb/pom.xml
... ...
@@ -1,5 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2  
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  2
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  3
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3 4
 
4 5
     <!-- Parent -->
5 6
     <parent>
@@ -23,6 +24,7 @@
23 24
     <properties>
24 25
 
25 26
         <!-- Versioning -->
  27
+        <version.jboss-spec-ejb>1.0.2.Final</version.jboss-spec-ejb>
26 28
 
27 29
     </properties>
28 30
 
@@ -47,9 +49,9 @@
47 49
             <scope>test</scope>
48 50
         </dependency>
49 51
         <dependency>
50  
-            <groupId>javax.ejb</groupId>
51  
-            <artifactId>ejb-api</artifactId>
52  
-            <version>3.0</version>
  52
+            <groupId>org.jboss.spec.javax.ejb</groupId>
  53
+            <artifactId>jboss-ejb-api_3.1_spec</artifactId>
  54
+            <version>${version.jboss-spec-ejb}</version>
53 55
             <scope>provided</scope>
54 56
         </dependency>
55 57
         <dependency>

0 notes on commit a022b62

Please sign in to comment.
Something went wrong with that request. Please try again.