You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2017/10/10 12:04:25 UTC
[1/2] tomee git commit: TOMEE-2133 update Tomcat
Repository: tomee
Updated Branches:
refs/heads/master 884e2a13e -> 1f90ee23c
TOMEE-2133 update Tomcat
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bdd41eb4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bdd41eb4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bdd41eb4
Branch: refs/heads/master
Commit: bdd41eb48076b370c07aaaa386c801049b17fca2
Parents: 884e2a1
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Tue Oct 10 09:40:14 2017 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Tue Oct 10 09:40:14 2017 +0100
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/bdd41eb4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dd1a9ff..718f6e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>17</version>
+ <version>18</version>
<relativePath><!--Resolve on repository--></relativePath>
</parent>
@@ -131,7 +131,7 @@
<version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
- <tomcat.version>8.5.21</tomcat.version>
+ <tomcat.version>8.5.23</tomcat.version>
<cxf.version>3.1.13</cxf.version>
<ehcache.version>2.10.3</ehcache.version>
[2/2] tomee git commit: Fix test failures
Posted by jg...@apache.org.
Fix test failures
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1f90ee23
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1f90ee23
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1f90ee23
Branch: refs/heads/master
Commit: 1f90ee23c2a6f91fe5902dbf320f9712fcbeac9a
Parents: bdd41eb
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Tue Oct 10 13:03:45 2017 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Tue Oct 10 13:03:45 2017 +0100
----------------------------------------------------------------------
.../src/test/java/org/superbiz/rest/GreetingServiceTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/1f90ee23/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java
----------------------------------------------------------------------
diff --git a/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java b/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java
index ecc79b6..da07ecc 100644
--- a/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java
+++ b/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java
@@ -65,6 +65,7 @@ public class GreetingServiceTest {
public void postXml() throws IOException {
final String message = WebClient.create("http://localhost:" + port).path("/test/greeting/")
.accept(MediaType.APPLICATION_XML_TYPE)
+ .type(MediaType.APPLICATION_XML_TYPE)
.post(new Request("Hi REST!"), GreetingService.Greet.class).getMessage();
assertEquals("hi rest!", message);
}
@@ -81,6 +82,7 @@ public class GreetingServiceTest {
public void postJson() throws IOException {
final String message = WebClient.create("http://localhost:" + port, asList(new JohnzonProvider<GreetingService.Greet>())).path("/test/greeting/")
.accept(MediaType.APPLICATION_JSON_TYPE)
+ .type(MediaType.APPLICATION_JSON_TYPE)
.post(new Request("Hi REST!"), GreetingService.Greet.class).getMessage();
assertEquals("hi rest!", message);
}