This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/master by this push: new 5907a5a upgrading tomee to drop some workaround in tests and try to make jenkins happy 5907a5a is described below commit 5907a5abff1fa174f6e2d53cf9085e54b2127271 Author: Romain Manni-Bucau <rmannibu...@gmail.com> AuthorDate: Tue Apr 28 07:42:50 2020 +0200 upgrading tomee to drop some workaround in tests and try to make jenkins happy --- johnzon-websocket/pom.xml | 37 +--------------------- .../src/test/resources/arquillian.xml | 6 ---- 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 9141539..655a024 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -30,7 +30,7 @@ <properties> <tomcat.version>8.5.9</tomcat.version> - <tomee.version>7.0.3</tomee.version> + <tomee.version>8.0.1</tomee.version> <staging.directory>${project.parent.reporting.outputDirectory}</staging.directory> </properties> @@ -131,41 +131,6 @@ </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> diff --git a/johnzon-websocket/src/test/resources/arquillian.xml b/johnzon-websocket/src/test/resources/arquillian.xml index 8274edf..1f2d9d0 100644 --- a/johnzon-websocket/src/test/resources/arquillian.xml +++ b/johnzon-websocket/src/test/resources/arquillian.xml @@ -32,12 +32,6 @@ <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"> - remove:javaee-api - mvn:org.apache.geronimo.specs:geronimo-json_1.1_spec:${geronimo-jsonp.version} - </property> </configuration> </container> </arquillian>