Repository: cxf Updated Branches: refs/heads/master 1a0519b5f -> a61e23530
add optional web-container choices dependency in logbrowser-blueprint sample's pom Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a61e2353 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a61e2353 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a61e2353 Branch: refs/heads/master Commit: a61e23530a59a057fd873a7e8ce645cde6e33af0 Parents: 1a0519b Author: Akitoshi Yoshida <[email protected]> Authored: Sat Nov 15 14:34:29 2014 +0100 Committer: Akitoshi Yoshida <[email protected]> Committed: Sat Nov 15 14:34:42 2014 +0100 ---------------------------------------------------------------------- .../samples/logbrowser-blueprint/pom.xml | 61 ++++++++++++-------- 1 file changed, 36 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a61e2353/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml b/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml index 17f8d3b..4ce02dc 100644 --- a/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml +++ b/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml @@ -30,25 +30,36 @@ <relativePath>..</relativePath> </parent> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-SymbolicName>${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false</Bundle-SymbolicName> - <Import-Package> - org.apache.cxf.jaxrs.servlet, - org.apache.abdera.parser.stax, - org.apache.abdera, - com.ctc.wstx.stax, - * - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false</Bundle-SymbolicName> + <Import-Package> + org.apache.cxf.jaxrs.servlet, + org.apache.abdera.parser.stax, + org.apache.abdera, + com.ctc.wstx.stax, + org.eclipse.jetty.continuation;resolution:=optional;version="[7.6,9)", + org.eclipse.jetty.websocket;resolution:=optional;version="[7.6,9)", + org.eclipse.jetty.websocket.api;resolution:=optional;version="[9.1,10)", + org.eclipse.jetty.websocket.server;resolution:=optional;version="[9.1,10)", + org.eclipse.jetty.websocket.servlet;resolution:=optional;version="[9.1,10)", + org.apache.catalina;resolution:=optional;version="[6.0,9)", + org.apache.catalina.comet;resolution:=optional;version="[6.0,9)", + org.apache.catalina.connector;resolution:=optional;version="[6.0,9)", + org.apache.catalina.util;resolution:=optional;version="[6.0,9)", + org.apache.catalina.websocket;resolution:=optional;version="[6.0,9)", + org.apache.coyote.http11.upgrade;resolution:=optional, + * + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> </build> <dependencies> <dependency> @@ -71,11 +82,11 @@ <artifactId>cxf-rt-transports-http-jetty</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-websocket</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-websocket</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.abdera</groupId> <artifactId>abdera-core</artifactId> @@ -88,7 +99,7 @@ <groupId>org.apache.james</groupId> <artifactId>apache-mime4j-core</artifactId> </exclusion> - </exclusions> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId>
