diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1db2a8ac7f0d8ce5748f55e5ea833f37ecb13171..1104f34f47e5a38a37838b67ae4cc86917f2158f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
# Changelog
+## 1.2 Release
+
+April 14, 2020
+
+1.2 is a service release that changes entity inheritance type to JOINED
+for improved query performance. See file-repository-core/src/main/resources/liquibase/liquibase-changeLog.yml
+for database upgrades.
+
+- cc20fbe JOINED inheritance strategy
+
+
## 1.1 Release
April 2, 2020
diff --git a/file-repository-core/pom.xml b/file-repository-core/pom.xml
index 4d86cea4538b01dc7cde095f4e1f64ead6f19bd2..234f81b04590aaa6275146a46ca795a8ef03fcd8 100644
--- a/file-repository-core/pom.xml
+++ b/file-repository-core/pom.xml
@@ -20,14 +20,13 @@
org.genesys-pgr
file-repository
- 1.2-SNAPSHOT
+ 2.0-SNAPSHOT
file-repository-core
Genesys File Repository
Simple DublinCore file repository
- 2.4
1.14
@@ -125,6 +124,13 @@
${spring.security.version}
+
+ org.hamcrest
+ hamcrest-library
+ ${org.hamcrest.version}
+ test
+
+
org.springframework.security
spring-security-test
@@ -162,7 +168,7 @@
org.springframework.data
spring-data-elasticsearch
- 2.1.15.RELEASE
+ 3.2.5.RELEASE
provided
@@ -175,7 +181,7 @@
org.hibernate
- hibernate-entitymanager
+ hibernate-core
${hibernate.version}
@@ -204,7 +210,7 @@
org.genesys-pgr
application-blocks-security
- 1.7-SNAPSHOT
+ ${application.blocks.version}
org.apache.tika
@@ -219,7 +225,12 @@
com.fasterxml.jackson.core
jackson-databind
- 2.8.8
+ ${jackson.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ ${jackson.version}
org.apache.commons
diff --git a/file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFile.java b/file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFile.java
index d047ee21c3ca90221f9826193b4f782fef47be9c..a629cf87044eca7cb468240dabf7c13e14bc69f9 100644
--- a/file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFile.java
+++ b/file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFile.java
@@ -72,7 +72,7 @@ public class RepositoryFile extends AuditedVersionedModelWithoutId implements Ac
/** The Constant serialVersionUID. */
private static final long serialVersionUID = -4816923593950502695L;
- public static final Sort DEFAULT_SORT = new Sort("originalFilename");
+ public static final Sort DEFAULT_SORT = Sort.by("originalFilename");
/** The id. */
@Id
diff --git a/file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFolder.java b/file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFolder.java
index 54fbff2d1a011821023207a9270fd24357a237f0..92f6243b13734226b61cb81a73ee7b2dafc4d170 100644
--- a/file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFolder.java
+++ b/file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFolder.java
@@ -61,7 +61,7 @@ public class RepositoryFolder extends UuidModel implements AclAwareModel {
/** The Constant serialVersionUID. */
private static final long serialVersionUID = -7947000802758739238L;
- public static final Sort DEFAULT_SORT = new Sort("name");
+ public static final Sort DEFAULT_SORT = Sort.by("name");
/**
* Reference to parent Folder. Root folders have this set to null. This
diff --git a/file-repository-core/src/main/java/org/genesys/filerepository/persistence/ImageGalleryPersistence.java b/file-repository-core/src/main/java/org/genesys/filerepository/persistence/ImageGalleryPersistence.java
index fa05d5103d4e9b4c84c38a4eb1c74af1085f2ae1..7ba5ca158f3fb7c953fc7b0280faeabe1e772a80 100644
--- a/file-repository-core/src/main/java/org/genesys/filerepository/persistence/ImageGalleryPersistence.java
+++ b/file-repository-core/src/main/java/org/genesys/filerepository/persistence/ImageGalleryPersistence.java
@@ -19,14 +19,14 @@ package org.genesys.filerepository.persistence;
import org.genesys.filerepository.model.ImageGallery;
import org.genesys.filerepository.model.RepositoryFolder;
import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.stereotype.Repository;
/**
* The Interface ImageGalleryPersistence.
*/
@Repository
-public interface ImageGalleryPersistence extends JpaRepository, QueryDslPredicateExecutor {
+public interface ImageGalleryPersistence extends JpaRepository, QuerydslPredicateExecutor {
/**
* Find gallery for specified path.
diff --git a/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryFilePersistence.java b/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryFilePersistence.java
index 42e76318828d86e7a0f0db1a00c434922436b88d..012c33ebb74462fbeef6ddfd5c2b4dac24ccf06d 100644
--- a/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryFilePersistence.java
+++ b/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryFilePersistence.java
@@ -23,7 +23,7 @@ import org.genesys.filerepository.RepositoryPersistence;
import org.genesys.filerepository.model.RepositoryFile;
import org.genesys.filerepository.model.RepositoryFolder;
import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.stereotype.Repository;
/**
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Repository;
*
*/
@Repository
-public interface RepositoryFilePersistence extends RepositoryPersistence, QueryDslPredicateExecutor {
+public interface RepositoryFilePersistence extends RepositoryPersistence, QuerydslPredicateExecutor {
/**
* Find by uuid.
diff --git a/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryFolderRepository.java b/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryFolderRepository.java
index f1a675420e5f51f78040c3e14d976dda6276eaa5..d97d21db7a6619894b503f8d73babe21de2c4432 100644
--- a/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryFolderRepository.java
+++ b/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryFolderRepository.java
@@ -22,14 +22,14 @@ import java.util.UUID;
import org.genesys.filerepository.RepositoryPersistence;
import org.genesys.filerepository.model.RepositoryFolder;
import org.springframework.data.domain.Pageable;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.stereotype.Repository;
/**
* JPA Repository for {@link RepositoryFolder}
*/
@Repository
-public interface RepositoryFolderRepository extends RepositoryPersistence, QueryDslPredicateExecutor {
+public interface RepositoryFolderRepository extends RepositoryPersistence, QuerydslPredicateExecutor {
/**
* Find by uuid.
diff --git a/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryImagePersistence.java b/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryImagePersistence.java
index bd71dee80b1e84ad01d8f5988876b5c127d57c90..f8f980a4fea3800838efba7c325ec605e99bd714 100644
--- a/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryImagePersistence.java
+++ b/file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryImagePersistence.java
@@ -23,14 +23,14 @@ import org.genesys.filerepository.RepositoryPersistence;
import org.genesys.filerepository.model.RepositoryFolder;
import org.genesys.filerepository.model.RepositoryImage;
import org.springframework.data.domain.Sort;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.stereotype.Repository;
/**
* The Interface RepositoryImagePersistence.
*/
@Repository
-public interface RepositoryImagePersistence extends RepositoryPersistence, QueryDslPredicateExecutor {
+public interface RepositoryImagePersistence extends RepositoryPersistence, QuerydslPredicateExecutor {
/**
* Find by uuid.
diff --git a/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/ImageGalleryServiceImpl.java b/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/ImageGalleryServiceImpl.java
index cbf8503e626e1444f50bf5bb389f74e2f7e69827..d3c1d9f7bfbc860bd5a48f88aeecaee02e06d2fe 100644
--- a/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/ImageGalleryServiceImpl.java
+++ b/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/ImageGalleryServiceImpl.java
@@ -56,6 +56,8 @@ import org.springframework.util.CollectionUtils;
import com.querydsl.jpa.impl.JPAQuery;
import com.querydsl.jpa.impl.JPAQueryFactory;
+import javax.persistence.EntityNotFoundException;
+
/**
* Image Gallery service.
*/
@@ -235,7 +237,7 @@ public class ImageGalleryServiceImpl implements ImageGalleryService {
@Transactional
@PreAuthorize("hasRole('ADMINISTRATOR') or hasPermission(#imageGallery, 'write')")
public ImageGallery updateImageGalery(final ImageGallery imageGallery, final String title, final String description) {
- final ImageGallery imageGallery2 = imageGalleryPersistence.findOne(imageGallery.getId());
+ final ImageGallery imageGallery2 = imageGalleryPersistence.findById(imageGallery.getId()).orElseThrow(() -> new EntityNotFoundException("Record not found."));
imageGallery2.setTitle(title);
imageGallery2.setDescription(description);
@@ -254,7 +256,7 @@ public class ImageGalleryServiceImpl implements ImageGalleryService {
@Transactional
@PreAuthorize("hasRole('ADMINISTRATOR') or hasPermission(#imageGallery, 'write')")
public ImageGallery saveImageOrder(final ImageGallery imageGallery) {
- final ImageGallery imageGallery2 = imageGalleryPersistence.findOne(imageGallery.getId());
+ final ImageGallery imageGallery2 = imageGalleryPersistence.findById(imageGallery.getId()).orElseThrow(() -> new EntityNotFoundException("Record not found."));
imageGallery2.setImages(imageGallery.getImages());
imageGalleryPersistence.save(imageGallery2);
@@ -266,7 +268,7 @@ public class ImageGalleryServiceImpl implements ImageGalleryService {
@Override
public void ensureThumbnails(final ImageGallery imageGallery) {
- final ImageGallery imageGallery2 = imageGalleryPersistence.findOne(imageGallery.getId());
+ final ImageGallery imageGallery2 = imageGalleryPersistence.findById(imageGallery.getId()).orElseThrow(() -> new EntityNotFoundException("Record not found."));
if (CollectionUtils.isEmpty(imageGallery2.getImages())) {
LOG.debug("ImageGallery has no images, skipping thumbnail generation for path=" + imageGallery2.getPath());
@@ -325,7 +327,7 @@ public class ImageGalleryServiceImpl implements ImageGalleryService {
@Override
public void ensureThumbnails(final ImageGallery imageGallery, final Integer width, final Integer height) {
- final ImageGallery imageGallery2 = imageGalleryPersistence.findOne(imageGallery.getId());
+ final ImageGallery imageGallery2 = imageGalleryPersistence.findById(imageGallery.getId()).orElseThrow(() -> new EntityNotFoundException("Record not found."));
if (CollectionUtils.isEmpty(imageGallery2.getImages())) {
LOG.debug("ImageGallery has no images, skipping thumbnail generation for path=" + imageGallery2.getPath());
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/config/DatabaseConfig.java b/file-repository-core/src/test/java/org/genesys/filerepository/config/DatabaseConfig.java
index f085e782811b49d0ae0ff6b563235472fe5204de..7766806ba408e092770e8e83bc2c6af3c9c62f78 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/config/DatabaseConfig.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/config/DatabaseConfig.java
@@ -33,7 +33,7 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.orm.hibernate4.HibernateExceptionTranslator;
+import org.springframework.orm.hibernate5.HibernateExceptionTranslator;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/config/ServiceBeanConfig.java b/file-repository-core/src/test/java/org/genesys/filerepository/config/ServiceBeanConfig.java
index 9b4a022cabe90e76dfdd2479f349e1a86bfd7aef..80a930a553cdc5c83e31d18281241e444de1a7c0 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/config/ServiceBeanConfig.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/config/ServiceBeanConfig.java
@@ -35,13 +35,11 @@ import org.genesys.filerepository.service.impl.S3StorageServiceImpl;
import org.genesys.filerepository.service.impl.ThumbnailGenerator1;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
// TODO: Auto-generated Javadoc
/**
@@ -74,13 +72,13 @@ public class ServiceBeanConfig implements InitializingBean, DisposableBean {
* @return the property placeholder configurer
*/
@Bean
- public static PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() {
- final PropertyPlaceholderConfigurer propertyPlaceholderConfigurer = new PropertyPlaceholderConfigurer();
+ public static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
+ final PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer = new PropertySourcesPlaceholderConfigurer();
// Need to ignore "genesys.properties" if not found
propertyPlaceholderConfigurer.setIgnoreResourceNotFound(true);
propertyPlaceholderConfigurer.setFileEncoding("utf-8");
- propertyPlaceholderConfigurer.setLocations(new Resource[] { new ClassPathResource("spring/spring.properties") });
+ propertyPlaceholderConfigurer.setLocations(new ClassPathResource("spring/spring.properties"));
return propertyPlaceholderConfigurer;
}
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryAddTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryAddTest.java
index b4a5721dc6070205a93ceadef1d59ad5bef8113e..9f996d3f19d1e5d8153659966a75bebe1bf7712e 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryAddTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryAddTest.java
@@ -16,8 +16,9 @@
package org.genesys.filerepository.service;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.nio.file.Path;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryDirectoryTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryDirectoryTest.java
index a0d197be466633e513256da655a997c269d2e8bd..6784d969441b04be6dd6903441ccfc1302bfbe43 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryDirectoryTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryDirectoryTest.java
@@ -16,8 +16,8 @@
package org.genesys.filerepository.service;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.nio.file.Path;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryTestUtil.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryTestUtil.java
index 78ad4e2bb5d7dc9c1936ba83515234873c3011ad..f0237cdadef7607ff76e287b3a9bb38b5d769b31 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryTestUtil.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryTestUtil.java
@@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException;
import java.io.InputStream;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryUpdateTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryUpdateTest.java
index bbed45879ffb5c05202e80d0e9569d67a4644202..816edc4b512ee961c9238d2169f79023f7a70818 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryUpdateTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryUpdateTest.java
@@ -17,7 +17,7 @@
package org.genesys.filerepository.service;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException;
import java.nio.file.Path;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/FileSystemStorageTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/FileSystemStorageTest.java
index 6f7d16bcded58722e23aaeb69d64567390c01f8a..ea2bc97dfe502bed8c3ab05bb93e1531aec32e93 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/FileSystemStorageTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/FileSystemStorageTest.java
@@ -17,7 +17,7 @@
package org.genesys.filerepository.service;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.File;
import java.io.FileNotFoundException;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryTest.java
index ef67cd5f8521a0587289ef4d2a23abf31386f148..63a3832ab20ce8dd04b6ac36e84e9e20bedaea43 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryTest.java
@@ -17,7 +17,7 @@
package org.genesys.filerepository.service;
import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException;
import java.nio.file.Path;
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+import javax.persistence.EntityNotFoundException;
import javax.transaction.Transactional;
import org.genesys.filerepository.InvalidRepositoryFileDataException;
@@ -150,7 +151,7 @@ public class ImageGalleryTest extends RepositoryServiceTest {
/**
* Update gallery blah null.
*/
- @Test(expected = NullPointerException.class)
+ @Test(expected = EntityNotFoundException.class)
public void updateGalleryBlahNull() {
imageGalleryService.updateImageGalery(new ImageGallery(), null, null);
}
@@ -409,19 +410,19 @@ public class ImageGalleryTest extends RepositoryServiceTest {
imageGalleryService.createImageGallery(initialPath.resolve("gallery2"), DEFAULT_GALLERY_TITLE, DEFAULT_GALLERY_DESCRIPTION);
imageGalleryService.createImageGallery(initialPath.resolve("sub/gallery3"), DEFAULT_GALLERY_TITLE, DEFAULT_GALLERY_DESCRIPTION);
- Page page = imageGalleryService.listImageGalleries(new PageRequest(0, 3));
+ Page page = imageGalleryService.listImageGalleries(PageRequest.of(0, 3));
assertThat(page.getContent().size(), is(3));
assertThat(page.getTotalElements(), is(3l));
- page = imageGalleryService.listImageGalleries(new PageRequest(0, 2));
+ page = imageGalleryService.listImageGalleries(PageRequest.of(0, 2));
assertThat(page.getContent().size(), is(2));
assertThat(page.getTotalElements(), is(3l));
- page = imageGalleryService.listImageGalleries(initialPath, new PageRequest(0, 3));
+ page = imageGalleryService.listImageGalleries(initialPath, PageRequest.of(0, 3));
assertThat(page.getContent().size(), is(3));
assertThat(page.getTotalElements(), is(3l));
- page = imageGalleryService.listImageGalleries(initialPath.resolve("sub"), new PageRequest(0, 3));
+ page = imageGalleryService.listImageGalleries(initialPath.resolve("sub"), PageRequest.of(0, 3));
assertThat(page.getContent().size(), is(1));
assertThat(page.getTotalElements(), is(1l));
}
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryThumbnailsTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryThumbnailsTest.java
index 73aa52187b8a368ba08d97d40688a47437ff71c9..a86d928f40143425d2772557be92757220a19e63 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryThumbnailsTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryThumbnailsTest.java
@@ -16,8 +16,8 @@
package org.genesys.filerepository.service;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/MetadataTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/MetadataTest.java
index e9c0c487862c65a6b5b2f0a596c533499f824c81..db374052f7588334e87e58e1c3bf5a950d306f1f 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/MetadataTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/MetadataTest.java
@@ -17,7 +17,7 @@
package org.genesys.filerepository.service;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException;
import java.nio.file.Path;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryFolderTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryFolderTest.java
index da7f3973665250d963544925a950772edadd2bb0..85732e2357bb546c4ee72f347f52e2007a3f66e2 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryFolderTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryFolderTest.java
@@ -17,7 +17,7 @@
package org.genesys.filerepository.service;
import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.nio.file.Path;
import java.nio.file.Paths;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryImageAddTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryImageAddTest.java
index 624e60d9e1328167d80eab92958e28de79658981..49ecc9fef3108339657d8b1cc951f0427f2e4093 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryImageAddTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryImageAddTest.java
@@ -17,7 +17,7 @@
package org.genesys.filerepository.service;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException;
import java.nio.file.Path;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryServiceTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryServiceTest.java
index 7d46cfc4961a366a67f84445f1e9b4041a798bc8..d6b281bd5129ef198c7ca98bdd301dbccceae699 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryServiceTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryServiceTest.java
@@ -1,7 +1,7 @@
package org.genesys.filerepository.service;
import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.nio.file.Path;
import java.nio.file.Paths;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/S3SignatureTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/S3SignatureTest.java
index b09121a282e5aace5e674d43f779fd0a30504ff6..bd4190d286e782768344bc51f8ff31b33968ee45 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/S3SignatureTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/S3SignatureTest.java
@@ -17,7 +17,7 @@
package org.genesys.filerepository.service;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.nio.charset.Charset;
import java.security.InvalidKeyException;
diff --git a/file-repository-core/src/test/java/org/genesys/filerepository/service/S3StorageServiceTest.java b/file-repository-core/src/test/java/org/genesys/filerepository/service/S3StorageServiceTest.java
index a5fed1b0f7b349372b4a99dc620790b389e3d666..23bca4a56cc5409d45c6148e5a66c63325732a2d 100644
--- a/file-repository-core/src/test/java/org/genesys/filerepository/service/S3StorageServiceTest.java
+++ b/file-repository-core/src/test/java/org/genesys/filerepository/service/S3StorageServiceTest.java
@@ -17,7 +17,8 @@
package org.genesys.filerepository.service;
import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertArrayEquals;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
diff --git a/file-repository-ftpserver/pom.xml b/file-repository-ftpserver/pom.xml
index 82a7d68d0cec7e3b3ea40f01d2d7653d5146db9e..7ea077fc78db780383c7f8bbad5c8e76d54a7b4f 100644
--- a/file-repository-ftpserver/pom.xml
+++ b/file-repository-ftpserver/pom.xml
@@ -20,7 +20,7 @@
org.genesys-pgr
file-repository
- 1.2-SNAPSHOT
+ 2.0-SNAPSHOT
file-repository-ftpserver
FTP/S for Genesys File Repository
@@ -79,24 +79,30 @@
ftp
test
+
+ org.hamcrest
+ hamcrest-library
+ ${org.hamcrest.version}
+ test
+
org.genesys-pgr
application-blocks-security
- 1.7-SNAPSHOT
+ ${application.blocks.version}
org.genesys-pgr
file-repository-core
- 1.2-SNAPSHOT
+ 2.0-SNAPSHOT
org.genesys-pgr
file-repository-core
test-jar
- 1.2-SNAPSHOT
+ 2.0-SNAPSHOT
test
diff --git a/file-repository-ftpserver/src/test/java/org/genesys/filerepository/service/ftp/FtpServerTest.java b/file-repository-ftpserver/src/test/java/org/genesys/filerepository/service/ftp/FtpServerTest.java
index ad998ad58beb221710cc7b671c48c9e0cc5428a2..5a57ae5a7e3ee5da400ed41adbcae09c226ffa1c 100644
--- a/file-repository-ftpserver/src/test/java/org/genesys/filerepository/service/ftp/FtpServerTest.java
+++ b/file-repository-ftpserver/src/test/java/org/genesys/filerepository/service/ftp/FtpServerTest.java
@@ -16,7 +16,7 @@
package org.genesys.filerepository.service.ftp;
import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/pom.xml b/pom.xml
index 6e40de81fdfd43ee70c267ba17850cdec56c7d64..703295209ea8a7bac6509d17d3e1b42b5f495653 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
4.0.0
org.genesys-pgr
file-repository
- 1.2-SNAPSHOT
+ 2.0-SNAPSHOT
Genesys File Repository
Parent project for the File Repository projects
https://gitlab.croptrust.org/genesys-pgr/file-repository
@@ -66,19 +66,20 @@
1.8
false
- 1.4-SNAPSHOT
+ 2.0-SNAPSHOT
1.6
- 4.12
- 1.3
- 2.4
- 4.3.2.RELEASE
- 4.1.3.RELEASE
- 1.10.4.RELEASE
- 4.1.4
- 4.3.11.Final
- 2.3.3
+ 4.13
+ 2.2
+ 2.6
+ 5.2.4.RELEASE
+ 5.2.2.RELEASE
+ 2.2.5.RELEASE
+ 4.2.1
+ 5.4.12.Final
+ 2.5.0
+ 2.10.3
@@ -120,12 +121,6 @@
${junit.version}
test
-
- org.hamcrest
- hamcrest-library
- ${org.hamcrest.version}
- test
-