Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
@aslakknutsen aslakknutsen authored
View
11 build/pom.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- vi:ts=2:sw=2:expandtab: -->
-<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">
+<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">
<!-- Parent -->
<parent>
@@ -24,8 +25,6 @@
<!-- Arquillian Core common Deps, Test related -->
<version.javax.inject_javax.inject>1</version.javax.inject_javax.inject>
- <version.jboss_logging>2.1.0.GA</version.jboss_logging>
- <version.jetty_jetty>6.1.9</version.jetty_jetty>
<version.junit_junit>4.8.1</version.junit_junit>
<version.mockito_all>1.8.3</version.mockito_all>
<version.testng_testng>5.14.6</version.testng_testng>
@@ -70,12 +69,6 @@
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-embedded</artifactId>
- <version>${version.jetty_jetty}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${version.mockito_all}</version>
View
15 protocols/servlet/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
<!-- Parent -->
<parent>
@@ -22,6 +23,7 @@
<properties>
<!-- Versioning -->
+ <version.jetty_jetty>8.1.2.v20120308</version.jetty_jetty>
</properties>
@@ -70,8 +72,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-embedded</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${version.jetty_jetty}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${version.jetty_jetty}</version>
<scope>test</scope>
</dependency>
</dependencies>
View
9 protocols/servlet/src/test/java/org/jboss/arquillian/protocol/servlet/AbstractServerBase.java
@@ -25,6 +25,8 @@
import java.util.Collection;
import java.util.List;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
import org.jboss.arquillian.container.spi.client.protocol.metadata.HTTPContext;
import org.jboss.arquillian.container.spi.client.protocol.metadata.Servlet;
import org.jboss.arquillian.protocol.servlet.runner.ServletTestRunner;
@@ -32,8 +34,6 @@
import org.jboss.arquillian.test.spi.TestMethodExecutor;
import org.junit.After;
import org.junit.Before;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
/**
* AbstractServerBase
@@ -49,8 +49,11 @@
public void setup() throws Exception
{
server = new Server(8181);
- Context root = new Context(server, "/arquillian-protocol", Context.SESSIONS);
+
+ ServletContextHandler root = new ServletContextHandler(ServletContextHandler.SESSIONS);
+ root.setContextPath("/arquillian-protocol");
root.addServlet(ServletTestRunner.class, ServletMethodExecutor.ARQUILLIAN_SERVLET_MAPPING);
+ server.setHandler(root);
server.start();
}
View
10 testenrichers/cdi/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
<!-- Parent -->
<parent>
@@ -98,6 +99,13 @@
<artifactId>weld-core</artifactId>
<version>${version.weld-core}</version>
<scope>test</scope>
+ <!-- ARQ-990 Removed, not needed runtime and not part of Fedora Maven Packages -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-build-config</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
View
10 testenrichers/ejb/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
<!-- Parent -->
<parent>
@@ -23,6 +24,7 @@
<properties>
<!-- Versioning -->
+ <version.jboss-spec-ejb>1.0.2.Final</version.jboss-spec-ejb>
</properties>
@@ -47,9 +49,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>${version.jboss-spec-ejb}</version>
<scope>provided</scope>
</dependency>
<dependency>
Please sign in to comment.
Something went wrong with that request. Please try again.