Skip to content

Commit

Permalink
Update to Jackson 2.9.9
Browse files Browse the repository at this point in the history
Update the SCIM 2 SDK to use Jackson 2.9.9.
Jackson 2.9.9 addresses a security vulnerability that was possible under certain specific conditions. The SCIM 2 SDK was not directly affected by this vulnerability.

This PR also includes the following changes:

* Deprecated the ScimDateFormat class. An alternative to this class will be provided in SCIM 2 SDK 2.3.0.
* Set the compile target to Java 7.
* Updated the Travis CI config to use OpenJDK 8. Java 7 is no longer available in the build environment, and Java 11 cannot be used until the target version is updated to Java 8 (see this OpenJDK issue).
  • Loading branch information
braveulysses authored Jun 24, 2019
2 parents cc16c8e + 22be211 commit e38e079
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 12 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
language: java
jdk:
- oraclejdk8
- openjdk7
- openjdk8
script: mvn package
19 changes: 16 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compileSource>1.6</compileSource>
<compileSource>1.7</compileSource>
<main.basedir>${project.basedir}</main.basedir>
<ignore.test.failures>false</ignore.test.failures>
<jackson.version>2.7.4</jackson.version>
<jackson-databind.version>2.7.9.5</jackson-databind.version>
<jackson.version>2.9.9</jackson.version>
<jackson-databind.version>2.9.9</jackson-databind.version>
<jax-rs.version>2.0.1</jax-rs.version>
<jersey.version>2.17</jersey.version>
<guava.version>20.0</guava.version>
Expand Down Expand Up @@ -144,6 +144,11 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down Expand Up @@ -180,6 +185,14 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${compileSource}</source>
<target>${compileSource}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public Path replace(final int index, final Filter valueFilter)
* @param index The exclusive index of the endpoint path element.
* @return A new path to a beginning portion of this path.
* @throws IndexOutOfBoundsException if the index is out of range
* (<tt>index &lt; 0 || index &gt; size()</tt>)
* ({@code index < 0 || index > size()})
*/
public Path subPath(final int index) throws IndexOutOfBoundsException
{
Expand All @@ -297,7 +297,7 @@ public Iterator<Element> iterator()
* @param index The index of the path element to retrieve.
* @return The path element at the index.
* @throws IndexOutOfBoundsException if the index is out of range
* (<tt>index &lt; 0 || index &gt;= size()</tt>)
* ({@code index < 0 || index >= size()})
*/
public Element getElement(final int index) throws IndexOutOfBoundsException
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public BadRequestException(final String errorMessage,
* @param errorMessage The error message for this SCIM exception.
* @param scimType The SCIM detailed error keyword.
* @param cause The cause (which is saved for later retrieval by the
* {@link #getCause()} method). (A <tt>null</tt> value
* {@link #getCause()} method). (A {@code null} value
* is permitted, and indicates that the cause is
* nonexistent or unknown.)
*/
Expand All @@ -116,7 +116,7 @@ public BadRequestException(final String errorMessage,
*
* @param scimError The SCIM error response.
* @param cause The cause (which is saved for later retrieval by the
* {@link #getCause()} method). (A <tt>null</tt> value
* {@link #getCause()} method). (A {@code null} value
* is permitted, and indicates that the cause is
* nonexistent or unknown.)
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public ForbiddenException(final String errorMessage) {
* @param errorMessage The error message for this SCIM exception.
* @param scimType The SCIM detailed error keyword.
* @param cause The cause (which is saved for later retrieval by the
* {@link #getCause()} method). (A <tt>null</tt> value
* {@link #getCause()} method). (A {@code null} value
* is permitted, and indicates that the cause is
* nonexistent or unknown.)
*/
Expand All @@ -60,7 +60,7 @@ public ForbiddenException(final String errorMessage,
*
* @param scimError The SCIM error response.
* @param cause The cause (which is saved for later retrieval by the
* {@link #getCause()} method). (A <tt>null</tt> value
* {@link #getCause()} method). (A {@code null} value
* is permitted, and indicates that the cause is
* nonexistent or unknown.)
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class MethodNotAllowedException extends ScimException
*
* @param scimError The SCIM error response.
* @param cause The cause (which is saved for later retrieval by the
* {@link #getCause()} method). (A <tt>null</tt> value
* {@link #getCause()} method). (A {@code null} value
* is permitted, and indicates that the cause is
* nonexistent or unknown.)
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
/**
* Like ISO8601DateFormat except this format includes milliseconds when
* serializing.
*
* @deprecated This class will no longer be needed in a future version of the
* SCIM 2 SDK.
*/
@Deprecated
public class ScimDateFormat extends ISO8601DateFormat
{
/**
Expand Down

0 comments on commit e38e079

Please sign in to comment.