Repository: cxf Updated Branches: refs/heads/master 438eadb78 -> a293c4db6
Minor updates to jaxrs spring boot demo pom Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a293c4db Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a293c4db Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a293c4db Branch: refs/heads/master Commit: a293c4db64e0136011afea865eac646f4129ce60 Parents: 438eadb Author: Sergey Beryozkin <[email protected]> Authored: Fri May 22 15:01:36 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Fri May 22 15:01:36 2015 +0100 ---------------------------------------------------------------------- .../release/samples/jaxrs_spring_boot/pom.xml | 54 +++++--------------- 1 file changed, 14 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a293c4db/distribution/src/main/release/samples/jaxrs_spring_boot/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jaxrs_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxrs_spring_boot/pom.xml index 0cb276d..c3b56f6 100644 --- a/distribution/src/main/release/samples/jaxrs_spring_boot/pom.xml +++ b/distribution/src/main/release/samples/jaxrs_spring_boot/pom.xml @@ -2,56 +2,33 @@ <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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> + <parent> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-samples</artifactId> - <version>1.3.0.BUILD-SNAPSHOT</version> - </parent> + <artifactId>spring-boot-starter-parent</artifactId> + <version>1.2.3.RELEASE</version> + </parent> <artifactId>spring-boot-sample-rs-cxf</artifactId> <name>Spring Boot Web Services Sample</name> <description>Spring Boot CXF Restful Web Services Sample</description> <url>http://projects.spring.io/spring-boot/</url> <properties> - <main.basedir>${basedir}/../..</main.basedir> - <cxf.version>3.0.0</cxf.version> - <spring.version>4.2.0.BUILD-SNAPSHOT</spring.version> + <cxf.version>3.1.1-SNAPSHOT</cxf.version> <jackson.version>2.3.0</jackson.version> <jetty.version>8.1.5.v20120716</jetty.version> - <java.version>1.7</java.version> - <m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot> </properties> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring.version}</version> + <version>1.2.3.RELEASE</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> + <version>1.2.3.RELEASE</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring.version}</version> - </dependency> - - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> <version>${cxf.version}</version> @@ -61,6 +38,12 @@ <artifactId>cxf-rt-transports-http</artifactId> <version>${cxf.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-service-description</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> @@ -82,11 +65,6 @@ <version>${jackson.version}</version> </dependency> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-bundle-jaxrs</artifactId> - <version>2.7.14</version> - </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jetty.version}</version> @@ -109,13 +87,9 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <version>1.2.3.RELEASE</version> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-service-description</artifactId> - <version>3.0.0-milestone1</version> - </dependency> </dependencies> <build> <plugins>
