Commit 01420582 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '123-release-1-4' into 'master'

Resolve "Release 1.4"

Closes #123

See merge request !113
parents ba0ee855 f9d6d4a9
# Changelog
## 1.4 Release
- 440630f Service and API endpoint to update dataset file metadata
- 2d72206 Fixed: Delete vocabulary requires `@Transactional`
- 3423d9e Dataset files are stored in repository under **/dataset/{dataset.uuid}** folder
- 42c9a0b Don't automatically create the ISO639-3 vocabulary
- f47fb68 Application configuration updated with FileRepositoryConfig
- 15cd05f Fixed faulty `key_descriptor` column
- 92c9dc1 Key descriptors
- 86155f7 Create system admin account (app-blocks:1.4)
- 6142542 Ensure one primary Partner record
- a84ee81 Store ISO639 vocabulary
- 1c2cdf1 Languages API endpoint
- d184833 Controlled Vocabulary - Languages
- 8b4afc5 Lazy load dataset on loadDataset
- 458028e Merge first and last name in Dataset Creator
## 1.3 Release
- 24be818 Using `BasicUserService` from app-blocks
......
......@@ -20,7 +20,7 @@
<groupId>org.genesys-pgr</groupId>
<artifactId>genesys-catalog-parent</artifactId>
<relativePath>../genesys-catalog-parent/pom.xml</relativePath>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>genesys-catalog-core</artifactId>
<packaging>jar</packaging>
......
......@@ -157,7 +157,7 @@ public interface DatasetService {
/**
* Adds the file to dataset.
*
* @param datasetUuid UUID of dataset
* @param dataset the dataset
* @param file file that be added to Db and dataset
* @return updated dataset
* @throws NotFoundElement NotFoundElement
......@@ -171,7 +171,7 @@ public interface DatasetService {
/**
* Removes the file of dataset.
*
* @param datasetUuid UUID of dataset
* @param dataset the dataset
* @param fileUuid UUID of repositoryFile
* @return updated dataset
* @throws NotFoundElement NotFoundElement
......@@ -184,7 +184,7 @@ public interface DatasetService {
/**
* Load list of RepositoryFile by uuid of dataset.
*
* @param datasetUuid dataset UUID
* @param dataset the dataset
* @return loaded list of RepositoryFile
* @throws NotFoundElement the not found element
*/
......@@ -229,12 +229,12 @@ public interface DatasetService {
Dataset unpublishDataset(Dataset dataset);
/**
* Update dataset file information
*
* Update dataset file information.
*
* @param dataset the dataset
* @param metadata the updated file metadata
* @return updated dataset
* @throws NoSuchRepositoryFileException
* @throws NoSuchRepositoryFileException the no such repository file exception
*/
@PreAuthorize("hasRole('ADMINISTRATOR') or hasPermission(#dataset, 'write')")
Dataset updateDatasetFile(Dataset dataset, RepositoryFile metadata) throws NoSuchRepositoryFileException;
......
......@@ -19,7 +19,7 @@
<parent>
<groupId>org.genesys-pgr</groupId>
<artifactId>genesys-catalog</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>genesys-catalog-parent</artifactId>
<packaging>pom</packaging>
......
......@@ -4,7 +4,7 @@
<groupId>org.genesys-pgr</groupId>
<artifactId>genesys-catalog-parent</artifactId>
<relativePath>../genesys-catalog-parent/pom.xml</relativePath>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>genesys-catalog-server</artifactId>
<packaging>war</packaging>
......@@ -93,7 +93,7 @@
<dependency>
<groupId>org.genesys-pgr</groupId>
<artifactId>genesys-catalog-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.security.oauth</groupId>
......@@ -166,7 +166,7 @@
<dependency>
<groupId>org.genesys-pgr</groupId>
<artifactId>genesys-catalog-core</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>commons-lang3</artifactId>
......
......@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.genesys-pgr</groupId>
<artifactId>genesys-catalog</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>The Genesys Catalog</name>
<description>This is the shared project pom.</description>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment