You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/03/07 17:45:56 UTC
[5/5] cxf git commit: Fix samples builds
Fix samples builds
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a38da9e8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a38da9e8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a38da9e8
Branch: refs/heads/master
Commit: a38da9e8f15fb158bf0982c61750ef48e5814792
Parents: a2c912b
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Mar 7 12:09:34 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Mar 7 12:45:36 2017 -0500
----------------------------------------------------------------------
distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml | 6 ------
.../src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java | 3 +--
.../src/main/release/samples/jax_rs/sse_spring/pom.xml | 6 ------
.../src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java | 3 +--
.../src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java | 3 +--
.../src/main/release/samples/jaxws_spring_boot/pom.xml | 7 ++++++-
.../java/sample/ws/service/SampleWsApplicationTests.java | 8 +++-----
distribution/src/main/release/samples/pom.xml | 5 +++++
parent/pom.xml | 5 +++++
9 files changed, 22 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a38da9e8/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
index 7311157..f2d1c8b 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
@@ -85,11 +85,6 @@
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-server</artifactId>
<version>${cxf.jetty9.version}</version>
@@ -98,7 +93,6 @@
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId>
- <version>2.4.3</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a38da9e8/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index f0fc750..6f48923 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -18,7 +18,6 @@
*/
package demo.jaxrs.sse;
-import java.io.IOException;
import java.util.Date;
import java.util.Random;
@@ -67,7 +66,7 @@ public class StatsRestServiceImpl {
Thread.sleep(1000);
sink.onNext(createStatsEvent(builder.name("stats"), 8));
sink.close();
- } catch (final InterruptedException | IOException e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a38da9e8/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
index fcab85d..89591fe 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
@@ -68,11 +68,6 @@
<version>${cxf.jetty9.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- </dependency>
-
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
@@ -97,7 +92,6 @@
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId>
- <version>2.4.3</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a38da9e8/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index 79d4450..f69946f 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -18,7 +18,6 @@
*/
package demo.jaxrs.sse;
-import java.io.IOException;
import java.util.Date;
import java.util.Random;
@@ -70,7 +69,7 @@ public class StatsRestServiceImpl {
Thread.sleep(1000);
sink.onNext(createStatsEvent(builder.name("stats"), 8));
sink.close();
- } catch (final InterruptedException | IOException e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a38da9e8/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index 44914f6..72ab7be 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -18,7 +18,6 @@
*/
package demo.jaxrs.sse;
-import java.io.IOException;
import java.util.Date;
import java.util.Random;
@@ -67,7 +66,7 @@ public class StatsRestServiceImpl {
Thread.sleep(1000);
sink.onNext(createStatsEvent(builder.name("stats"), 8));
sink.close();
- } catch (final InterruptedException | IOException e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a38da9e8/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 6ed3360..5bda72c 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -30,7 +30,11 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-ws</artifactId>
+ <artifactId>spring-boot-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web-services</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -48,6 +52,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version>
<configuration>
<mainClass>sample.ws.SampleWsApplication</mainClass>
</configuration>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a38da9e8/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTests.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTests.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTests.java
index 0b9de2c..4e06fae 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTests.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTests.java
@@ -28,9 +28,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.OutputCapture;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.ws.client.core.WebServiceTemplate;
@@ -42,9 +41,8 @@ import sample.ws.SampleWsApplication;
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = SampleWsApplication.class)
+@SpringBootTest(classes = SampleWsApplication.class, properties = "server.port=0")
@WebAppConfiguration
-@IntegrationTest("server.port=0")
public class SampleWsApplicationTests {
//CHECKSTYLE:OFF
http://git-wip-us.apache.org/repos/asf/cxf/blob/a38da9e8/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 9b2af93..ffa3fcc 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -168,6 +168,11 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.4</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a38da9e8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 569a0bd..307d074 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -877,6 +877,11 @@
<version>2.7.7</version>
</dependency>
<dependency>
+ <groupId>org.atmosphere</groupId>
+ <artifactId>atmosphere-runtime</artifactId>
+ <version>${cxf.atmosphere.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
<version>${cxf.neethi.version}</version>