Repository: johnzon Updated Branches: refs/heads/JSONP-1.1 24b01af8e -> 498aff8bd
upgrading the new jsonp api in tomee Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/498aff8b Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/498aff8b Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/498aff8b Branch: refs/heads/JSONP-1.1 Commit: 498aff8bd36a7b733f3108be3bceeed508a60797 Parents: 24b01af Author: rmannibucau <[email protected]> Authored: Tue Nov 22 22:17:15 2016 +0100 Committer: rmannibucau <[email protected]> Committed: Tue Nov 22 22:17:15 2016 +0100 ---------------------------------------------------------------------- johnzon-websocket/pom.xml | 42 ++++++++++++++++++++ .../src/test/resources/arquillian.xml | 5 +++ 2 files changed, 47 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/johnzon/blob/498aff8b/johnzon-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 8d5b4dd..3420410 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -109,6 +109,13 @@ </dependencies> <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -119,6 +126,41 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <executions> + <execution> <!-- override some ee api --> + <id>unpack-ee-api</id> + <phase>generate-test-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/ee-api</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>org.apache.tomee</groupId> + <artifactId>javaee-api</artifactId> + <version>7.0-1</version> + <type>zip</type> + <excludes> + LICENSE,NOTICE,README.txt, + geronimo-jaspic_1.0_spec*jar, + geronimo-jsp_2.2_spec*.jar, + javaee-api*.jar, + tomcat-el-api*.jar, + tomcat-servlet-api*.jar, + tomcat-websocket-api*.jar, + geronimo-json_1.0_spec*.jar + </excludes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution> http://git-wip-us.apache.org/repos/asf/johnzon/blob/498aff8b/johnzon-websocket/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/johnzon-websocket/src/test/resources/arquillian.xml b/johnzon-websocket/src/test/resources/arquillian.xml index 1f2d9d0..db21eae 100644 --- a/johnzon-websocket/src/test/resources/arquillian.xml +++ b/johnzon-websocket/src/test/resources/arquillian.xml @@ -32,6 +32,11 @@ <property name="cleanOnStartUp">true</property> <property name="dir">target/apache-tomee-remote</property> <property name="appWorkingDir">target/arquillian-test-working-dir</property> + <!-- override jsonp api --> + <property name="lib">${project.build.directory}/ee-api</property> + <property name="additionalLibs"> + mvn:org.apache.geronimo.specs:geronimo-json_1.1_spec:${jsonspecversion} + </property> </configuration> </container> </arquillian>
