You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2015/02/05 16:24:30 UTC
cxf git commit: separate jetty8 and jetty9 dependencies in
systests/jaxrs
Repository: cxf
Updated Branches:
refs/heads/master d083c2023 -> 005ee936d
separate jetty8 and jetty9 dependencies in systests/jaxrs
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/005ee936
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/005ee936
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/005ee936
Branch: refs/heads/master
Commit: 005ee936d42897f7083fd9fe26addec4779d4764
Parents: d083c20
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Thu Feb 5 16:23:20 2015 +0100
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Thu Feb 5 16:23:20 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 6 ++++
systests/jaxrs/pom.xml | 76 +++++++++++++++++++++++++++++----------------
2 files changed, 55 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/005ee936/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5d1f914..1d41459 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1831,6 +1831,12 @@
</properties>
</profile>
<profile>
+ <id>jetty8</id>
+ <properties>
+ <cxf.jetty.version>${cxf.jetty8.version}</cxf.jetty.version>
+ </properties>
+ </profile>
+ <profile>
<!-- Profile for testing with EclipseLink MOXy based JAXB implementation -->
<id>eclipse.moxy</id>
<properties>
http://git-wip-us.apache.org/repos/asf/cxf/blob/005ee936/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index d4e83f1..b908d64 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -147,29 +147,6 @@
<artifactId>jetty-util</artifactId>
<version>${cxf.jetty.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${cxf.jetty9.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-websocket</artifactId>
- <version>${cxf.jetty8.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jaas</artifactId>
- <version>${cxf.jetty9.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -484,10 +461,10 @@
<artifactId>tika-parsers</artifactId>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -551,6 +528,51 @@
</dependencies>
</profile>
<profile>
+ <id>jetty8</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>${cxf.jetty8.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-websocket</artifactId>
+ <version>${cxf.jetty8.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jetty9</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-server</artifactId>
+ <version>${cxf.jetty9.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jaas</artifactId>
+ <version>${cxf.jetty9.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>atmosphere</id>
<dependencies>
<dependency>