cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-7093, CXF-7101] Including spring boot demos in the distribution build, patch from John Ament applied with thanks, This closes #183
Date Mon, 24 Oct 2016 10:31:13 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 81dd064d1 -> d46818bd3


[CXF-7093,CXF-7101] Including spring boot demos in the distribution build, patch from John
Ament applied with thanks, This closes #183


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d46818bd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d46818bd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d46818bd

Branch: refs/heads/master
Commit: d46818bd3043d211774de9bc531849f54bb2989f
Parents: 81dd064
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Mon Oct 24 11:01:46 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Mon Oct 24 11:30:48 2016 +0100

----------------------------------------------------------------------
 .../release/samples/jax_rs/spring_boot/README   |   7 +-
 .../release/samples/jax_rs/spring_boot/pom.xml  | 115 +++++++++++--------
 .../rs/client/SampleRestClientApplication.java  |   5 +-
 .../jax_rs/spring_boot_scan/application/README  |   7 +-
 .../jax_rs/spring_boot_scan/application/pom.xml |  80 +++++++------
 .../jax_rs/spring_boot_scan/client/pom.xml      |  76 +++++++-----
 .../rs/client/SampleRestClientApplication.java  |   5 +-
 .../spring_boot_scan/eureka-registry/pom.xml    |  29 +++--
 .../release/samples/jaxws_spring_boot/pom.xml   |  72 +++++++-----
 distribution/src/main/release/samples/pom.xml   |  14 +--
 10 files changed, 240 insertions(+), 170 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d46818bd/distribution/src/main/release/samples/jax_rs/spring_boot/README
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/README b/distribution/src/main/release/samples/jax_rs/spring_boot/README
index 81b4b4d..c97cbef 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/README
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/README
@@ -7,8 +7,10 @@ The sample uses Maven. It can be built and run from the command line:
 
 ----
 $ mvn -Pserver
+----
 or
-$ java -jar target/spring-boot-sample-rs-cxf-3.2.0-SNAPSHOT.jar
+----
+$ java -jar target/spring-boot-sample-rs-cxf.jar
 ----
 
 http://localhost:8080/services/helloservice/sayHello/ApacheCxfUser
@@ -36,5 +38,4 @@ To run the client from a command line open a new terminal window and run:
 
 ----
 $ mvn -Pclient
-----
-
+----
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/d46818bd/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index 46e8dcd..e33c792 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -1,44 +1,59 @@
 <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.3.6.RELEASE</version>
-    </parent> 
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
     <artifactId>spring-boot-sample-rs-cxf</artifactId>
-    <groupId>org.apache.cxf.samples</groupId>
-    <version>3.2.0-SNAPSHOT</version>
     <name>Spring Boot CXF REST Application</name>
     <description>Spring Boot CXF REST Application</description>
-    
-    <properties>
-        <cxf.version>3.2.0-SNAPSHOT</cxf.version>
-    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <!-- Import dependency management from Spring Boot -->
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
-            <version>${cxf.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-              <groupId>org.webjars</groupId>
-              <artifactId>swagger-ui</artifactId>
-              <version>2.1.0</version>
+            <groupId>org.webjars</groupId>
+            <artifactId>swagger-ui</artifactId>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>${cxf.version}</version>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
     <build>
-      <plugins>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.boot.version}</version>
                 <configuration>
-                   <mainClass>sample.rs.service.SampleRestApplication</mainClass>
+                    <mainClass>sample.rs.service.SampleRestApplication</mainClass>
                 </configuration>
                 <executions>
                     <execution>
@@ -48,38 +63,40 @@
                     </execution>
                 </executions>
             </plugin>
-      </plugins>
+        </plugins>
     </build>
     <profiles>
-       <profile>
-         <id>server</id>
-         <build>
-           <defaultGoal>spring-boot:run</defaultGoal>
-           <plugins>
-             <plugin>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-maven-plugin</artifactId>
-              <configuration>
-                <mainClass>sample.rs.service.SampleRestApplication</mainClass>
-              </configuration>  
-             </plugin>
-           </plugins>
-          </build>
-       </profile>
-       <profile>
-         <id>client</id>
-         <build>
-           <defaultGoal>spring-boot:run</defaultGoal>
-           <plugins>
-             <plugin>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-maven-plugin</artifactId>
-              <configuration>
-                <mainClass>sample.rs.client.SampleRestClientApplication</mainClass>
-              </configuration>  
-             </plugin>
-           </plugins>
-          </build>
-       </profile>
+        <profile>
+            <id>server</id>
+            <build>
+                <defaultGoal>spring-boot:run</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <version>${spring.boot.version}</version>
+                        <configuration>
+                            <mainClass>sample.rs.service.SampleRestApplication</mainClass>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>client</id>
+            <build>
+                <defaultGoal>spring-boot:run</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <version>${spring.boot.version}</version>
+                        <configuration>
+                            <mainClass>sample.rs.client.SampleRestClientApplication</mainClass>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d46818bd/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 8dbf659..aeb054b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -31,10 +31,7 @@ import sample.rs.service.HelloService;
 @SpringBootApplication
 @EnableJaxRsWebClient
 @EnableJaxRsProxyClient
-public final class SampleRestClientApplication {
-    private SampleRestClientApplication() {
-    }
-    
+public class SampleRestClientApplication {
     public static void main(String[] args) {
         new SpringApplicationBuilder(SampleRestClientApplication.class)
             .web(false)

http://git-wip-us.apache.org/repos/asf/cxf/blob/d46818bd/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
index 639237f..6295e29 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/README
@@ -22,6 +22,8 @@ $ mvn spring-boot:run
 $ mvn -Pserver
 ----
 
+3. Check that the server is deployed:
+
 http://localhost:8080/services/helloservice/sayHello/ApacheCxfUser
 
 will display "Hello ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!"
@@ -30,10 +32,9 @@ http://localhost:8080/services/helloservice/sayHello2/ApacheCxfUser
 
 will display "Hello2 ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!"
 
-
 Check client/README on how to run a command line client.
 
-3. Swagger JSON and UI
+4. Swagger JSON and UI
 
 http://localhost:8080/services/helloservice/swagger.json will return a Swagger JSON
 description of services.
@@ -50,7 +51,7 @@ or access it from the CXF Services page:
 (Note - CXF Services page is available by default at the path ending with "/services" - but
in this demo
 it has been configured to listen at "/info")
 
-4. System metrics and health checks 
+5. System metrics and health checks
 
 http://localhost:8080/system/metrics 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d46818bd/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index 2695dca..8b624e6 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -1,43 +1,48 @@
 <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.3.6.RELEASE</version>
-    </parent> 
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+        <relativePath>../../..</relativePath>
+    </parent>
     <artifactId>spring-boot-sample-rs-cxf-scan-app</artifactId>
-    <groupId>org.apache.cxf.samples</groupId>
-    <version>3.2.0-SNAPSHOT</version>
     <name>Spring Boot CXF REST Scan Application</name>
     <description>Spring Boot CXF REST Scan Application</description>
-    
-    <properties>
-        <cxf.version>3.2.0-SNAPSHOT</cxf.version>
-        <cxf.zest.version>2.1</cxf.zest.version> 
-        <spring.boot.version>1.3.6.RELEASE</spring.boot.version>
-        <spring.cloud.eureka.version>1.1.3.RELEASE</spring.cloud.eureka.version>
-    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <!-- Import dependency management from Spring Boot -->
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
-            <version>${cxf.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-              <groupId>org.webjars</groupId>
-              <artifactId>swagger-ui</artifactId>
-              <version>2.1.0</version>
+            <groupId>org.webjars</groupId>
+            <artifactId>swagger-ui</artifactId>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>${cxf.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-features-metrics</artifactId>
-            <version>${cxf.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <!-- Eureka Service Discovery Client -->
         <dependency>
@@ -45,7 +50,7 @@
             <artifactId>spring-cloud-starter-eureka</artifactId>
             <version>${spring.cloud.eureka.version}</version>
         </dependency>
-        <!-- Actuator Endpoints --> 
+        <!-- Actuator Endpoints -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-actuator</artifactId>
@@ -54,19 +59,28 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <profiles>
-       <profile>
-         <id>server</id>
-         <build>
-           <defaultGoal>spring-boot:run</defaultGoal>
-           <plugins>
-             <plugin>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-maven-plugin</artifactId>
-             </plugin>
-           </plugins>
-          </build>
-       </profile>
+        <profile>
+            <id>server</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <defaultGoal>spring-boot:run</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <version>${spring.boot.version}</version>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d46818bd/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
index 660755d..40ad3c4 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
@@ -1,35 +1,44 @@
 <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.3.6.RELEASE</version>
-    </parent> 
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+        <relativePath>../../..</relativePath>
+    </parent>
     <artifactId>spring-boot-sample-rs-cxf-scan-client</artifactId>
-    <groupId>org.apache.cxf.samples</groupId>
-    <version>3.2.0-SNAPSHOT</version>
     <name>Spring Boot CXF REST Scan Application Client</name>
     <description>Spring Boot CXF REST Scan Application Client</description>
-    
+
     <properties>
-        <cxf.version>3.2.0-SNAPSHOT</cxf.version>
-        <cxf.zest.version>2.1</cxf.zest.version> 
-        <spring.boot.version>1.3.6.RELEASE</spring.boot.version>
-        <spring.cloud.eureka.version>1.1.3.RELEASE</spring.cloud.eureka.version>
+        <cxf.zest.version>2.1</cxf.zest.version>
     </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <!-- Import dependency management from Spring Boot -->
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <!-- CXF JAX-RS Client -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>${cxf.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <!-- CXF FailoverFeature - pluggable with various strategies -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-features-clustering</artifactId>
-            <version>${cxf.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <!-- Eureka Service Discovery Client -->
         <dependency>
@@ -43,22 +52,31 @@
             <artifactId>org.qi4j.library.circuitbreaker</artifactId>
             <version>${cxf.zest.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <profiles>
-       <profile>
-         <id>client</id>
-         <build>
-           <defaultGoal>spring-boot:run</defaultGoal>
-           <plugins>
-             <plugin>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-maven-plugin</artifactId>
-              <configuration>
-                <mainClass>sample.rs.client.SampleRestClientApplication</mainClass>
-              </configuration>  
-             </plugin>
-           </plugins>
-          </build>
-       </profile>
+        <profile>
+            <id>client</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <defaultGoal>spring-boot:run</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <version>${spring.boot.version}</version>
+                        <configuration>
+                            <mainClass>sample.rs.client.SampleRestClientApplication</mainClass>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d46818bd/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 43d48a6..fac11e6 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -44,10 +44,7 @@ import sample.rs.service.HelloService;
 @SpringBootApplication
 @EnableEurekaClient
 @EnableJaxRsProxyClient
-public final class SampleRestClientApplication {
-    private SampleRestClientApplication() {
-    }
-    
+public class SampleRestClientApplication {
     public static void main(String[] args) {
         new SpringApplicationBuilder(SampleRestClientApplication.class)
             .web(false)

http://git-wip-us.apache.org/repos/asf/cxf/blob/d46818bd/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index 2bcd46b..36830d6 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -2,28 +2,40 @@
 <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>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-dependencies</artifactId>
-        <version>Brixton.RELEASE</version>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+        <relativePath>../../..</relativePath>
     </parent>
-
     <artifactId>eureka-registry-for-cxf</artifactId>
-    <groupId>org.apache.cxf.samples</groupId>
-    <version>3.2.0-SNAPSHOT</version>
     <name>Eureka Registry for CXF SpringBoot demos</name>
     <description>Eureka Registry for CXF SpringBoot demos</description>
     <properties>
         <start-class>registry.eureka.RegistryApplication</start-class>
     </properties>
-
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-netflix</artifactId>
+                <version>1.2.1.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-eureka-server</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 
@@ -32,6 +44,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.boot.version}</version>
             </plugin>
         </plugins>
     </build>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d46818bd/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index cbc02fb..5ff97c2 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -1,55 +1,65 @@
 <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.3.5.RELEASE</version>
-    </parent> 
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
     <artifactId>spring-boot-sample-ws-cxf</artifactId>
-    <groupId>org.apache.cxf.samples</groupId>
-    <version>3.2.0-SNAPSHOT</version>
     <name>Spring Boot CXF Web Services Sample</name>
     <description>Spring Boot CXF Web Services Sample</description>
-    <properties>
-        <cxf.version>3.2.0-SNAPSHOT</cxf.version>
-    </properties> 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <!-- Import dependency management from Spring Boot -->
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>1.3.5.RELEASE</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-ws</artifactId>
-            <version>1.3.5.RELEASE</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
-            <version>${cxf.version}</version>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
-               <groupId>org.springframework.boot</groupId>
-               <artifactId>spring-boot-maven-plugin</artifactId>
-                           <configuration>
-                        <mainClass>sample.ws.SampleWsApplication</mainClass>
-                   </configuration>  
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>sample.ws.SampleWsApplication</mainClass>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>sample.ws.service.client.HelloClient</mainClass>
+                </configuration>
             </plugin>
-                        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <configuration>
-              <mainClass>sample.ws.service.client.HelloClient</mainClass>
-            </configuration>
-           </plugin>
-                        
+
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
@@ -57,7 +67,9 @@
                 <configuration>
                     <imageName>${project.groupId}/${project.artifactId}</imageName>
                     <baseImage>frolvlad/alpine-oraclejdk8:slim</baseImage>
-                    <entryPoint>java -Djava.security.egd=file:/dev/./urandom -jar ${project.build.finalName}.jar</entryPoint>
+                    <entryPoint>java -Djava.security.egd=file:/dev/./urandom -jar
+                        ${project.build.finalName}.jar
+                    </entryPoint>
                     <resources>
                         <resource>
                             <targetPath>/</targetPath>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d46818bd/distribution/src/main/release/samples/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 156413c..f90aad6 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,6 +30,8 @@
         <!-- don't deploy the samples, kind of pointless -->
         <maven.deploy.skip>true</maven.deploy.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spring.boot.version>1.3.6.RELEASE</spring.boot.version>
+        <spring.cloud.eureka.version>1.1.3.RELEASE</spring.cloud.eureka.version>
     </properties>
     <dependencies>
         <dependency>
@@ -99,6 +101,11 @@
         <module>wsdl_first_rpclit</module>
         <module>jms_pubsub</module>
         <module>jax_rs/spring_security</module>
+        <module>jax_rs/spring_boot</module>
+        <module>jax_rs/spring_boot_scan/application</module>
+        <module>jax_rs/spring_boot_scan/client</module>
+        <module>jax_rs/spring_boot_scan/eureka-registry</module>
+        <module>jaxws_spring_boot</module>
         <module>logbrowser</module>
         <module>logbrowser-blueprint</module>
         <module>ws_notification</module>
@@ -118,13 +125,6 @@
         <module>jax_rs/sse_cdi</module>
         <module>jax_rs/sse_tomcat</module>
         <module>jax_rs/sse_spring</module>
-        
-        <!--
-         These are removed from the build as they currently don't inherit the parent from

-         this pom and thus have problems with deploys 
-        <module>jaxws_spring_boot</module>
-        <module>jax_rs/jaxrs_spring_boot</module>
-        -->
     </modules>
     <dependencyManagement>
         <dependencies>


Mime
View raw message