Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-conway committed May 12, 2021
2 parents 1804207 + 93c48e5 commit d2c86e9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

# Project: Jargon Extensions Interface

### Date:
### Release Version: 4.3.2.1-SNAPSHOT
### git tag:
### Date: 02/26/2021
### Release Version: 4.3.2.1-RELEASE
### git tag: 4.3.2.1-RELEASE

#### Developer: Mike Conway - DICE

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.irods</groupId>
<artifactId>jargon-pom</artifactId>
<version>4.3.2.1-SNAPSHOT</version>
<version>4.3.2.1-RELEASE</version>
</parent>
<name>jargon-extensions-if</name>
<description />
Expand Down Expand Up @@ -149,7 +149,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>27.1-jre</version>
<version>29.0-jre</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package org.irods.jargon.extensions.thumbnail;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;

public class ThumbnailListEntry {
Expand All @@ -11,9 +8,9 @@ public class ThumbnailListEntry {
private int id = 0;
@JsonProperty("name")
private String name = "";
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
@JsonProperty("lastModified")
private Date lastModified;
private String lastModified;
@JsonProperty("thumbnails")
private String thumbnails = "";

Expand All @@ -33,11 +30,11 @@ public void setName(String name) {
this.name = name;
}

public Date getLastModified() {
public String getLastModified() {
return lastModified;
}

public void setLastModified(Date lastModified) {
public void setLastModified(String lastModified) {
this.lastModified = lastModified;
}

Expand Down

0 comments on commit d2c86e9

Please sign in to comment.