Skip to content

Commits on Source 8

......@@ -6,20 +6,20 @@ script:
language: java
jdk:
- oraclejdk8
- oraclejdk9
- oraclejdk11
env:
- SERVER_VERSION=10.1.0.Final
- SERVER_VERSION=10.0.0.Final
- SERVER_VERSION=11.0.0.Final
- SERVER_VERSION=12.0.0.Final
- SERVER_VERSION=13.0.0.Final
- SERVER_VERSION=14.0.0.Final
matrix:
exclude:
- jdk: oraclejdk9
env: SERVER_VERSION=10.0.0.Final
- jdk: oraclejdk9
env: SERVER_VERSION=10.1.0.Final
cache:
directories:
- $HOME/.m2
- jdk: oraclejdk11
env: SERVER_VERSION=12.0.0.Final
- jdk: oraclejdk11
env: SERVER_VERSION=13.0.0.Final
#cache:
# directories:
# - $HOME/.m2
addons:
apt:
packages:
......
......@@ -25,7 +25,7 @@ To read the documentation you can [read it online](http://resteasy.jboss.org/doc
A wiki exists with historical documents. You can find it [here](https://developer.jboss.org/wiki/ResteasyWIKI)
## Issues
Issues are kept in [JIRA](http://jira.jboss.org/jira/browse/RESTEASY)
Issues are kept in [JIRA](https://issues.jboss.org/browse/RESTEASY).
## Build
After pulling down a clone of the RESTEasy repository run
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.5.0.Final</version>
<version>3.6.1.SP2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>RESTEASY-1056-jetty-bv11</artifactId>
......@@ -57,8 +57,8 @@
<artifactId>jboss-jaxb-api_2.3_spec</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.5.0.Final</version>
<version>3.6.1.SP2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>RESTEASY-736-jetty</artifactId>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.5.0.Final</version>
<version>3.6.1.SP2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>RESTEasy Misc Arquillian-based tests</name>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.5.0.Final</version>
<version>3.6.1.SP2</version>
</parent>
<groupId>org.jboss.as</groupId>
......
......@@ -4,12 +4,12 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.5.0.Final</version>
<version>3.6.1.SP2</version>
</parent>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-dist</artifactId>
<version>8.0.0m-alpha-20130417-resteasy-3.5.0.Final</version>
<version>8.0.0m-alpha-20130417-resteasy-3.6.1.SP2</version>
<packaging>pom</packaging>
<name>Custom AS8 Resteasy Distribution</name>
<description/>
......
<?xml version="1.0"?>
<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2013, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
~ This is free software; you can redistribute it and/or modify it
~ under the terms of the GNU Lesser General Public License as
~ published by the Free Software Foundation; either version 2.1 of
~ the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
~ Lesser General Public License for more details.
~
~ You should have received a copy of the GNU Lesser General Public
~ License along with this software; if not, write to the Free
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>
<module name="RegexpSingleline">
<!-- \s matches whitespace character, $ matches end of line. -->
<property name="format" value="\s+$"/>
<property name="message" value="Line has trailing spaces."/>
</module>
<module name="TreeWalker">
<module name="SuppressWithNearbyCommentFilter">
<property name="commentFormat" value="@cs-: (\w+) \((\w|\s)+\)"/>
<property name="checkFormat" value="$1"/>
<property name="influenceFormat" value="0"/>
</module>
<property name="cacheFile" value="${checkstyle.cache.file}"/>
<!-- Checks for imports -->
<module name="AvoidStarImport">
<property name="allowStaticMemberImports" value="true"/>
</module>
<module name="RedundantImport"/>
<module name="UnusedImports">
<property name="processJavadoc" value="true" />
</module>
<!-- Modifier Checks -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<!-- Checks for blocks. -->
<!--<module name="LeftCurly">
<property name="option" value="eol"/>
</module>
<module name="NeedBraces"/>
<module name="RightCurly">
<property name="option" value="same"/>
</module>
<module name="TypecastParenPad"/>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround"/>-->
<!-- Checks for common coding problems -->
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="IllegalInstantiation"/>
<!-- final parameters check, enabled only for constructors -->
<module name="FinalParameters">
<property name="tokens" value="CTOR_DEF"/>
</module>
<!-- Miscellaneous other checks. -->
<module name="UpperEll"/>
<module name="PackageAnnotation"/>
<module name="CovariantEquals"/>
<module name="ArrayTypeStyle"/>
<!-- Checks for System.out -->
<module name="Regexp">
<property name="format" value="System\.out"/>
<property name="illegalPattern" value="true"/>
</module>
<!-- Checks for System.err -->
<module name="Regexp">
<property name="format" value="System\.err"/>
<property name="illegalPattern" value="true"/>
</module>
<!-- Checks for printStackTrace -->
<module name="Regexp">
<property name="format" value="printStackTrace\(\)"/>
<property name="illegalPattern" value="true"/>
</module>
</module>
</module>
resteasy (3.5.0-1) UNRELEASED; urgency=medium
resteasy (3.6.1.SP2-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
......@@ -6,6 +6,8 @@ resteasy (3.5.0-1) UNRELEASED; urgency=medium
- Update Maven rules
- Add libreactive-streams-java to build-depends
- Add libgeronimo-validation-1.1-spec-java to build-depends
* poms: Ignore client-jetty, client-microprofile.
* maven.rules: Updated.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 13 Mar 2018 17:23:12 +0200
......
......@@ -47,6 +47,8 @@ resteasy-bom/pom.xml --ignore
resteasy-cache/pom.xml --ignore
resteasy-cdi/pom.xml --ignore
resteasy-client/pom.xml --has-package-version
resteasy-client-jetty/pom.xml --ignore
resteasy-client-microprofile/pom.xml --ignore
resteasy-dependencies-bom/pom.xml --no-parent --has-package-version
resteasy-guice/pom.xml --ignore
resteasy-jaxrs/pom.xml --has-package-version
......
......@@ -14,3 +14,4 @@ s/org.jboss.spec.javax.servlet/javax.servlet/ s/jboss-servlet-api_3.1_spec/javax
s/org.jboss.spec.javax.el/javax.el/ s/jboss-el-api_3.0_spec/javax.el-api/ * s/.*/3.0/ * *
s/org.jboss.spec.javax.ws.rs/javax.ws.rs/ s/jboss-jaxrs-api_2.1_spec/javax.ws.rs-api/ * s/.*/debian/ * *
s/javax.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.1_spec/ * s/.*/debian/ * *
s/org.jboss.spec.javax.xml.bind/javax.xml.bind/ s/jboss-jaxb-api_2.3_spec/jaxb-api/ * * *
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.5.0.Final</version>
<version>3.6.1.SP2</version>
</parent>
<artifactId>resteasy-jaxrs-dist</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-dist</artifactId>
<version>3.5.0.Final</version>
<version>3.6.1.SP2</version>
</parent>
<artifactId>resteasy-jaxrs-src-dist</artifactId>
......
......@@ -6,7 +6,7 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-reference-guide-${translation}</artifactId>
<version>3.5.0.Final</version>
<version>3.6.1.SP2</version>
<packaging>jdocbook</packaging>
<name>RESTEasy Reference Guide (${translation})</name>
<description/>
......@@ -43,7 +43,7 @@
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<version>2.3.8</version>
<version>2.3.9</version>
<extensions>true</extensions>
<dependencies>
......
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
[
<!ENTITY Overview SYSTEM "modules/Overview.xml">
<!ENTITY License SYSTEM "modules/License.xml">
......@@ -14,11 +14,13 @@
<!ENTITY _CookieParam SYSTEM "modules/_CookieParam.xml">
<!ENTITY _FormParam SYSTEM "modules/_FormParam.xml">
<!ENTITY _Form SYSTEM "modules/_Form.xml">
<!ENTITY _NewParam SYSTEM "modules/_NewParam.xml">
<!ENTITY Cache_NoCache_CacheControl SYSTEM "modules/Cache_NoCache_CacheControl.xml">
<!ENTITY _DefaultValue SYSTEM "modules/_DefaultValue.xml">
<!ENTITY _Encoded_and_encoding SYSTEM "modules/_Encoded_and_encoding.xml">
<!ENTITY _Context SYSTEM "modules/_Context.xml">
<!ENTITY JAX-RS_Resource_Locators_and_Sub_Resources SYSTEM "modules/JAX-RS_Resource_Locators_and_Sub_Resources.xml">
<!ENTITY Resources_Metadata SYSTEM "modules/Resources_Metadata.xml">
<!ENTITY JAX-RS_Content_Negotiation SYSTEM "modules/JAX-RS_Content_Negotiation.xml">
<!ENTITY Content_Marshalling_Providers SYSTEM "modules/Content_Marshalling_Providers.xml">
<!ENTITY StringConverter SYSTEM "modules/StringConverter.xml">
......@@ -46,7 +48,6 @@
<!ENTITY Json-p SYSTEM "modules/Json-p.xml">
<!ENTITY Jaxb SYSTEM "modules/Jaxb.xml">
<!ENTITY Yaml SYSTEM "modules/Yaml.xml">
<!ENTITY Seam SYSTEM "modules/Seam.xml">
<!ENTITY Guice SYSTEM "modules/Guice.xml">
<!ENTITY Interceptors SYSTEM "modules/Interceptors.xml">
<!ENTITY Books SYSTEM "modules/Books.xml">
......@@ -66,7 +67,7 @@
<bookinfo>
<title>RESTEasy JAX-RS</title>
<subtitle>RESTFul Web Services for Java</subtitle>
<releaseinfo>3.5.0.Final</releaseinfo>
<releaseinfo>3.6.1.SP2</releaseinfo>
</bookinfo>
<toc/>
......@@ -111,10 +112,12 @@ This one is short
&_CookieParam;
&_FormParam;
&_Form;
&_NewParam;
&_DefaultValue;
&_Encoded_and_encoding;
&_Context;
&JAX-RS_Resource_Locators_and_Sub_Resources;
&Resources_Metadata;
&JAX-RS_Content_Negotiation;
&Content_Marshalling_Providers;
&Jaxb;
......@@ -145,7 +148,6 @@ This one is short
&RESTEasy_EJB_Integration;
&RESTEasy_Spring_Integration;
&CDI;
&Seam;
&Guice;
&RESTEasy_Client_Framework;
&AJAX_Client;
......
......@@ -136,7 +136,7 @@ public static void main(String[] args) throws Exception
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-cache-core</artifactId>
<version>3.5.0.Final</version>
<version>3.6.1.SP2</version>
</dependency>
]]>
</programlisting>
......
......@@ -7,7 +7,7 @@
</para>
<para>
If you are scanning your path for JAX-RS annotated resource beans, your beans will be registered in per-request mode. This means an instance will be created per HTTP request served. Generally, you will need information from your environment. If you are running within a servlet container using the WAR-file distribution, in Beta-2 and lower, you can only use the JNDI lookups to obtain references to Java EE resources and configuration information. In this case, define your EE configuration (i.e. ejb-ref, env-entry, persistence-context-ref, etc...) within web.xml of the resteasy WAR file. Then within your code do jndi lookups in the java:comp namespace. For example:
If you are scanning your path for JAX-RS annotated resource beans, your beans will be registered in per-request mode. This means an instance will be created per HTTP request served. Generally, you will need information from your environment. If you are running within a servlet container using the WAR-file distribution, in 1.0.0.Beta-2 and lower, you can only use the JNDI lookups to obtain references to Java EE resources and configuration information. In this case, define your EE configuration (i.e. ejb-ref, env-entry, persistence-context-ref, etc...) within web.xml of the resteasy WAR file. Then within your code do jndi lookups in the java:comp namespace. For example:
</para>
<para>
......
......@@ -739,6 +739,20 @@ public class MyApplication extends Application
independent of the setting of this parameter.
</entry>
</row>
<row>
<entry>
jaxrs.2.0.request.matching
</entry>
<entry>
false
</entry>
<entry>
In searching for a matching resource method with which to respond to a request,
consider only resource methods with the best match for the request path. See
<link linkend='JAX-RS_2_0_Matching_Algorithm'>JAX-RS 2.0 Matching Algorithm</link>
for discussion.
</entry>
</row>
</tbody>
</tgroup>
</table>
......
......@@ -198,5 +198,18 @@
entity providers for JSON-B take precedence over those for JSON-P for all types
except JsonValue and its sub-types.
</para>
<para>
The support for JSON-B is provided by the <code>JsonBindingProvider</code> from <code>resteasy-json-binding-provider</code> module.
To satisfy JAX-RS 2.1 requirements, JsonBindingProvider takes precedence over the other providers for dealing with JSON payloads,
in particular the Jackson one. The JSON outputs (for the same input) from Jackson and JSON-B reference implementation can be slightly
different. As a consequence, in order to allow retaining backward compatibility, RESTEasy offers a
<code>resteasy.preferJacksonOverJsonB</code> context property that can be set to <code>true</code> to disable JsonBindingProvider
for the current deloyment.
</para>
<para>
WildFly 14 supports specifying the default value for the <code>resteasy.preferJacksonOverJsonB</code> context property by setting
a system property with the same name. Moreover, if no value is set for the context and system properties, it scans JAX-RS deployments
for Jackson annotations and sets the property to <code>true</code> if any of those annotations is found.
</para>
</sect1>
</chapter>
......@@ -9,7 +9,7 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-json-p-provider</artifactId>
<version>3.5.0.Final</version>
<version>3.6.1.SP2</version>
</dependency>
]]></programlisting>
<para>
......