You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2015/03/24 16:52:05 UTC
incubator-johnzon git commit: dont use jar dependency in maven reactor
Repository: incubator-johnzon
Updated Branches:
refs/heads/master 622f4a495 -> 0a336cc1d
dont use jar dependency in maven reactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/0a336cc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/0a336cc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/0a336cc1
Branch: refs/heads/master
Commit: 0a336cc1d2098b686c02b4c5fceb14414100de9f
Parents: 622f4a4
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Mar 24 16:51:59 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Mar 24 16:51:59 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/johnzon/websocket/JsrCodecTest.java | 9 ++++-----
.../java/org/apache/johnzon/websocket/MapperCodecTest.java | 9 ++++-----
2 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/0a336cc1/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
----------------------------------------------------------------------
diff --git a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
index 9fc860e..11d7790 100644
--- a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
+++ b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
@@ -56,12 +56,11 @@ public class JsrCodecTest {
public static WebArchive war() {
return ShrinkWrap.create(WebArchive.class, "jsr-codec.war")
.addClasses(JsrServerEndpointImpl.class, ServerReport.class, Message.class /* for report endpoint */)
- .addAsLibrary(
- ShrinkWrap.create(JavaArchive.class, "johnzon-websocket.jar")
- .addClasses(FactoryLocator.class, JsrDecoder.class, JsrEncoder.class, JsrObjectDecoder.class, JsrObjectEncoder.class))
.addAsLibraries(
- jarLocation(Json.class),
- jarLocation(JsonProviderImpl.class));
+ ShrinkWrap.create(JavaArchive.class, "johnzon-websocket.jar")
+ .addClasses(FactoryLocator.class, JsrDecoder.class, JsrEncoder.class, JsrObjectDecoder.class, JsrObjectEncoder.class)
+ .addPackages(true, JsonProviderImpl.class.getPackage()))
+ .addAsLibrary(jarLocation(Json.class));
}
@ArquillianResource
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/0a336cc1/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
----------------------------------------------------------------------
diff --git a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
index 1212941..9b2770c 100644
--- a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
+++ b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
@@ -58,11 +58,10 @@ public class MapperCodecTest {
.addClasses(ServerEndpointImpl.class, ServerReport.class, Message.class)
.addAsLibrary(
ShrinkWrap.create(JavaArchive.class, "johnzon-websocket.jar")
- .addClasses(MapperLocator.class, JohnzonTextDecoder.class, JohnzonTextEncoder.class))
- .addAsLibraries(
- jarLocation(Json.class),
- jarLocation(JsonProviderImpl.class),
- jarLocation(Mapper.class));
+ .addClasses(MapperLocator.class, JohnzonTextDecoder.class, JohnzonTextEncoder.class)
+ .addPackages(true, JsonProviderImpl.class.getPackage())
+ .addPackages(true, Mapper.class.getPackage()))
+ .addAsLibrary(jarLocation(Json.class));
}
@ArquillianResource