gCubeSystem
/
grsf-common-library
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged changes made in branch 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-common-library@171270 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2018-09-03 09:04:23 +00:00
parent 0eff7379ab
commit ac41f3cd6d
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distro/changelog.xml
View File

@ -6,6 +6,8 @@
<Change>Added 'Connected'-'Not Connected' tag to GRSF Records #11766</Change>
<Change>Add group for SDG flag #11767</Change>
<Change>Added citation field #11811</Change>
<Change>Changed 'State and trend of Marine Resource' to 'State and Trend' #11968</Change>
<Change>Changed 'Scientific advice' to 'Scientific Advice' #11969</Change>
</Changeset>
<Changeset component="org.gcube.data-catalogue.grsf-common-library.1-0-2"
date="2018-03-21">

2
pom.xml
View File

@ -13,7 +13,7 @@
<groupId>org.gcube.data-catalogue</groupId>
<artifactId>grsf-common-library</artifactId>
<packaging>jar</packaging>
<version>1.0.3-SNAPSHOT</version>
<version>1.0.4-SNAPSHOT</version>
<description>
Common library for GRSF service and management panel.

4
src/main/java/org/gcube/datacatalogue/common/Constants.java
View File

@ -77,13 +77,13 @@ public class Constants {
public static final String FISHING_PRESSURE_FIRMS_JSON_KEY = "firms_standard_fishing_pressure";
public static final String FISHING_PRESSURE_CUSTOM_KEY = "Fishing Pressure";
public static final String FISHING_PRESSURE_JSON_KEY = "fishing_pressure";
public static final String STATE_AND_TREND_MARINE_RESOURCE_CUSTOM_KEY = "State and trend of Marine Resource";
public static final String STATE_AND_TREND_MARINE_RESOURCE_CUSTOM_KEY = "State and Trend";
public static final String STATE_AND_TREND_MARINE_RESOURCE_JSON_KEY = "state_and_trend_of_marine_resources";
public static final String FAO_CATEGORIES_CUSTOM_KEY = "Fao Categories";
public static final String FAO_CATEGORIES_JSON_KEY = "fao_categories";
public static final String BIOMASS_CUSTOM_KEY = "Biomass";
public static final String BIOMASS_JSON_KEY = "biomass";
public static final String SCIENTIFIC_ADVICE_CUSTOM_KEY = "Scientific advice";
public static final String SCIENTIFIC_ADVICE_CUSTOM_KEY = "Scientific Advice";
public static final String SCIENTIFIC_ADVICE_JSON_KEY = "scientific_advice";
public static final String ASSESSOR_CUSTOM_KEY = "Assessor";
public static final String ASSESSOR_JSON_KEY = "assessor";

2
src/main/java/org/gcube/datacatalogue/common/enums/Fishery_Type.java
View File

@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
*/
public enum Fishery_Type {
Fishing_Unit("Fishing Uni"), // for fishery
Fishing_Unit("Fishing Unit"), // for fishery
Other_Fishery("Other Fishery"); // for fishery
private String subGroupNameOrig;