diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java index 4bac00e7657..81afbe3a775 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java @@ -163,6 +163,9 @@ public class TokenParam extends BaseParam implements IQueryParameterType { return StringUtils.isEmpty(myValue); } + /** + * Returns true if {@link #getModifier()} returns {@link TokenParamModifier#TEXT} + */ public boolean isText() { return myModifier == TokenParamModifier.TEXT; } @@ -178,8 +181,9 @@ public class TokenParam extends BaseParam implements IQueryParameterType { } /** - * @deprecated Use + * @deprecated Use {@link #setModifier(TokenParamModifier)} instead */ + @Deprecated public TokenParam setText(boolean theText) { if (theText) { myModifier = TokenParamModifier.TEXT; diff --git a/pom.xml b/pom.xml index b571b9c9e2f..9daae5a0adf 100644 --- a/pom.xml +++ b/pom.xml @@ -245,11 +245,10 @@ 10.12.1.1 2.22.1 - - 9.3.6.v20151106 + 9.3.7.v20160115 - 5.0.6.Final + 5.0.7.Final 5.2.2.Final 2.5.3 1.8 @@ -569,17 +568,17 @@ org.slf4j slf4j-android - 1.7.13 + 1.7.14 org.slf4j slf4j-api - 1.7.13 + 1.7.14 org.slf4j jcl-over-slf4j - 1.7.13 + 1.7.14 org.springframework @@ -680,7 +679,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + 3.5 1.6 1.6 @@ -697,12 +696,12 @@ org.codehaus.plexus plexus-compiler-javac - 2.6 + 2.7 org.codehaus.plexus plexus-compiler-javac-errorprone - 2.6 + 2.7 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index eeb8b88afcc..10b9a0d2a94 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -12,11 +12,12 @@ latest versions (dependent HAPI modules listed in brackets): -
  • Hibernate (JPA, Web Tester): 5.0.3 -> 5.0.6
  • +
  • Hibernate (JPA, Web Tester): 5.0.3 -> 5.0.7
  • Springframework (JPA, Web Tester): 4.2.2 -> 4.2.4
  • Phloc-Commons (Schematron Validator): 4.3.6 -> 4.4.4
  • Apache httpclient (Client): 4.4 -> 4.5.1
  • Apache httpcore (Client): 4.4 -> 4.4.4
  • +
  • SLF4j (All): 1.7.13 -> 1.7.14
  • ]]>