Skip to content

Commit

Permalink
Merge pull request #382 from charvolant/master
Browse files Browse the repository at this point in the history 
Release 2.5.0
  • Loading branch information
@charvolant
charvolant authored May 24, 2020
2 parents 8b8664c + 7b4dea5 commit 5c55b02
Show file tree
Hide file tree
Showing 16 changed files with 1,123 additions and 23 deletions.
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<groupId>au.org.ala</groupId>
<artifactId>biocache-store</artifactId>
<version>2.4.8</version>
<version>2.5.0</version>
<url>https://biocache.ala.org.au</url>
<issueManagement>
<system>GitHub</system>
Expand Down Expand Up @@ -178,7 +178,7 @@
<dependency>
<groupId>au.org.ala</groupId>
<artifactId>sds</artifactId>
<version>1.4.4</version>
<version>1.4.5</version>
<exclusions>
<exclusion>
<groupId>commons-lang</groupId>
Expand Down Expand Up @@ -220,7 +220,7 @@
<dependency>
<groupId>au.org.ala</groupId>
<artifactId>ala-name-matching</artifactId>
<version>3.3</version>
<version>3.4</version>
<exclusions>
<exclusion>
<groupId>org.gbif</groupId>
Expand Down
97 changes: 97 additions & 0 deletions src/main/resources/license.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
CC-BY-NC-SA 3.0 (Au) .*(cc|creativecommons).*by.*nc.*sa.*3\.0.*au.*
CC-BY-NC-ND 3.0 (Au) .*(cc|creativecommons).*by.*nc.*nd.*3\.0.*au.*
CC-BY-NC-SA 2.5 (Au) .*(cc|creativecommons).*by.*nc.*sa.*2\.5.*au.*
CC-BY-NC-ND 2.5 (Au) .*(cc|creativecommons).*by.*nc.*nd.*2\.5.*au.*
CC-BY-NC-SA 2.0 (Au) .*(cc|creativecommons).*by.*nc.*sa.*2\.0.*au.*
CC-BY-NC-ND 2.0 (Au) .*(cc|creativecommons).*by.*nc.*nd.*2\.0.*au.*
CC-BY-NC-SA 1.0 (Au) .*(cc|creativecommons).*by.*nc.*sa.*1\.0.*au.*
CC-BY-ND-NC 1.0 (Au) .*(cc|creativecommons).*by.*nd.*nc.*1\.0.*au.*
CC-BY-NC-SA 4.0 (Au) .*(cc|creativecommons).*by.*nc.*sa.*(4\.0)?.*au.*
CC-BY-NC-ND 4.0 (Au) .*(cc|creativecommons).*by.*nc.*nd.*(4\.0)?.*au.*
CC-BY-SA 3.0 (Au) .*(cc|creativecommons).*by.*sa.*3\.0.*au.*
CC-BY-NC 3.0 (Au) .*(cc|creativecommons).*by.*nc.*3\.0.*au.*
CC-BY-ND 3.0 (Au) .*(cc|creativecommons).*by.*nd.*3\.0.*au.*
CC-BY-SA 2.5 (Au) .*(cc|creativecommons).*by.*sa.*2\.5.*au.*
CC-BY-NC 2.5 (Au) .*(cc|creativecommons).*by.*nc.*2\.5.*au.*
CC-BY-ND 2.5 (Au) .*(cc|creativecommons).*by.*nd.*2\.5.*au.*
CC-BY-SA 2.0 (Au) .*(cc|creativecommons).*by.*sa.*2\.0.*au.*
CC-BY-NC 2.0 (Au) .*(cc|creativecommons).*by.*nc.*2\.0.*au.*
CC-BY-ND 2.0 (Au) .*(cc|creativecommons).*by.*nd.*2\.0.*au.*
CC-BY-SA 1.0 (Au) .*(cc|creativecommons).*by.*sa.*1\.0.*au.*
CC-BY-NC 1.0 (Au) .*(cc|creativecommons).*by.*nc.*1\.0.*au.*
CC-BY-ND 1.0 (Au) .*(cc|creativecommons).*by.*nd.*1\.0.*au.*
CC-BY-SA 4.0 (Au) .*(cc|creativecommons).*by.*sa.*(4\.0)?.*au.*
CC-BY-NC 4.0 (Au) .*(cc|creativecommons).*by.*nc.*(4\.0)?.*au.*
CC-BY-ND 4.0 (Au) .*(cc|creativecommons).*by.*nd.*(4\.0)?.*au.*
CC-BY 3.0 (Au) .*(cc|creativecommons).*by.*3\.0.*au.*
CC-BY 2.5 (Au) .*(cc|creativecommons).*by.*2\.5.*au.*
CC-BY 2.0 (Au) .*(cc|creativecommons).*by.*2\.0.*au.*
CC-BY 1.0 (Au) .*(cc|creativecommons).*by.*1\.0.*au.*
CC-BY 4.0 (Au) .*(cc|creativecommons).*by.*(4\.0)?.*au.*
CC-BY-NC-SA 3.0 (Int) .*(cc|creativecommons).*by.*nc.*sa.*3\.0.*(int)?.*
CC-BY-NC-ND 3.0 (Int) .*(cc|creativecommons).*by.*nc.*nd.*3\.0.*(int)?.*
CC-BY-NC-SA 2.5 (Int) .*(cc|creativecommons).*by.*nc.*sa.*2\.5.*(int)?.*
CC-BY-NC-ND 2.5 (Int) .*(cc|creativecommons).*by.*nc.*nd.*2\.5.*(int)?.*
CC-BY-NC-SA 2.0 (Int) .*(cc|creativecommons).*by.*nc.*sa.*2\.0.*(int)?.*
CC-BY-NC-ND 2.0 (Int) .*(cc|creativecommons).*by.*nc.*nd.*2\.0.*(int)?.*
CC-BY-NC-SA 1.0 (Int) .*(cc|creativecommons).*by.*nc.*sa.*1\.0.*(int)?.*
CC-BY-ND-NC 1.0 (Int) .*(cc|creativecommons).*by.*nd.*nc.*1\.0.*(int)?.*
CC-BY-NC-SA 4.0 (Int) .*(cc|creativecommons).*by.*nc.*sa.*(4\.0)?.*(int)?.*
CC-BY-NC-ND 4.0 (Int) .*(cc|creativecommons).*by.*nc.*nd.*(4\.0)?.*(int)?.*
CC-BY-SA 3.0 (Int) .*(cc|creativecommons).*by.*sa.*3\.0.*(int)?.*
CC-BY-NC 3.0 (Int) .*(cc|creativecommons).*by.*nc.*3\.0.*(int)?.*
CC-BY-ND 3.0 (Int) .*(cc|creativecommons).*by.*nd.*3\.0.*(int)?.*
CC-BY-SA 2.5 (Int) .*(cc|creativecommons).*by.*sa.*2\.5.*(int)?.*
CC-BY-NC 2.5 (Int) .*(cc|creativecommons).*by.*nc.*2\.5.*(int)?.*
CC-BY-ND 2.5 (Int) .*(cc|creativecommons).*by.*nd.*2\.5.*(int)?.*
CC-BY-SA 2.0 (Int) .*(cc|creativecommons).*by.*sa.*2\.0.*(int)?.*
CC-BY-NC 2.0 (Int) .*(cc|creativecommons).*by.*nc.*2\.0.*(int)?.*
CC-BY-ND 2.0 (Int) .*(cc|creativecommons).*by.*nd.*2\.0.*(int)?.*
CC-BY-SA 1.0 (Int) .*(cc|creativecommons).*by.*sa.*1\.0.*(int)?.*
CC-BY-NC 1.0 (Int) .*(cc|creativecommons).*by.*nc.*1\.0.*(int)?.*
CC-BY-ND 1.0 (Int) .*(cc|creativecommons).*by.*nd.*1\.0.*(int)?.*
CC-BY-SA 4.0 (Int) .*(cc|creativecommons).*by.*sa.*(4\.0)?.*(int)?.*
CC-BY-NC 4.0 (Int) .*(cc|creativecommons).*by.*nc.*(4\.0)?.*(int)?.*
CC-BY-ND 4.0 (Int) .*(cc|creativecommons).*by.*nd.*(4\.0)?.*(int)?.*
CC-BY 3.0 (Int) .*(cc|creativecommons).*by.*3\.0.*(int)?.*
CC-BY 2.5 (Int) .*(cc|creativecommons).*by.*2\.5.*(int)?.*
CC-BY 2.0 (Int) .*(cc|creativecommons).*by.*2\.0.*(int)?.*
CC-BY 1.0 (Int) .*(cc|creativecommons).*by.*1\.0.*(int)?.*
CC-BY 4.0 (Int) .*(cc|creativecommons).*by.*(4\.0)?.*(int)?.*
CC-BY-NC-SA 3.0 (Au) .*attribution.*(nc|non[ \-]?commercial).*(sa|share[ \-]?alike).*3\.0.*au.*
CC-BY-NC-ND 3.0 (Au) .*attribution.*(nc|non[ \-]?commercial).*(nd|no[ \-]?deriv).*3\.0.*au.*
CC-BY-NC 3.0 (Au) .*attribution.*(nc|non[ \-]?commercial).3\.0.*au.*
CC-BY-ND 3.0 (Au) .*attribution.*(nd|no[ \-]?deriv).*3\.0.*au.*
CC-BY-SA 3.0 (Au) .*attribution.*(sa|share[ \-]?alike).*3\.0.*au.*
CC-BY-NC 3.0 (Au) .*attribution.*(nc|non[ \-]?commercial).*3\.0.*au.*
CC-BY-ND 3.0 (Au) .*attribution.*(nd|no[ \-]?deriv).*3\.0.*au.*
CC-BY 3.0 (Au) .*attribution.*3\.0.*au.*
CC-BY-NC-SA 3.0 (Au) .*attribution.*(nc|non[ \-]?commercial).*(sa|share[ \-]?alike).*au.*3\.0.*
CC-BY-NC-ND 3.0 (Au) .*attribution.*(nc|non[ \-]?commercial).*(nd|no[ \-]?deriv).*au.*3\.0.*
CC-BY-NC 3.0 (Au) .*attribution.*(nc|non[ \-]?commercial).au.*3\.0.*
CC-BY-ND 3.0 (Au) .*attribution.*(nd|no[ \-]?deriv).*au.*3\.0.*
CC-BY-SA 3.0 (Au) .*attribution.*(sa|share[ \-]?alike).*au.*3\.0.*
CC-BY-NC 3.0 (Au) .*attribution.*(nc|non[ \-]?commercial).*au.*3\.0.*
CC-BY-ND 3.0 (Au) .*attribution.*(nd|no[ \-]?deriv).*au.*3\.0.*
CC-BY 3.0 (Au) .*attribution.*au.*3\.0.*
CC-BY-NC-SA 4.0 (Au) .*attribution.*(nc|non[ \-]?commercial).*(sa|share[ \-]?alike).*(4\.0)?.*au.*
CC-BY-NC-ND 4.0 (Au) .*attribution.*(nc|non[ \-]?commercial).*(nd|no[ \-]?deriv).*(4\.0)?.*au.*
CC-BY-NC 4.0 (Au) .*attribution.*(nc|non[ \-]?commercial).(4\.0)?.*au.*
CC-BY-ND 4.0 (Au) .*attribution.*(nd|no[ \-]?deriv).*(4\.0)?.*au.*
CC-BY-SA 4.0 (Au) .*attribution.*(sa|share[ \-]?alike).*(4\.0)?.*au.*
CC-BY-NC 4.0 (Au) .*attribution.*(nc|non[ \-]?commercial).*(4\.0)?.*au.*
CC-BY-ND 4.0 (Au) .*attribution.*(nd|no[ \-]?deriv).*(4\.0)?.*au.*
CC-BY 4.0 (Au) .*attribution.*(4\.0)?.*au.*
CC-BY-NC-SA 4.0 (Int) .*attribution.*(nc|non[ \-]?commercial).*(sa|share[ \-]?alike).*
CC-BY-NC-ND 4.0 (Int) .*attribution.*(nc|non[ \-]?commercial).*(nd|no[ \-]?deriv).*
CC-BY-NC 4.0 (Int) .*attribution.*(nc|non[ \-]?commercial).*
CC-BY-ND 4.0 (Int) .*attribution.*(nd|no[ \-]?deriv).*
CC-BY-SA 4.0 (Int) .*attribution.*(sa|share[ \-]?alike).*
CC-BY-NC 4.0 (Int) .*attribution.*(nc|non[ \-]?commercial).*
CC-BY-ND 4.0 (Int) .*attribution.*(nd|no[ \-]?deriv).*
CC-BY 4.0 (Int) .*attribution.*
CC0 .*(cc|creativecommons).*zero.*
CC0 .*(cc|creativecommons)(-)?0.*
PDM .*pdm.*
PDM .*public.*domain.*mark.*
Custom .*
1 change: 1 addition & 0 deletions src/main/scala/au/org/ala/biocache/cmd/CMD2.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ object CMD2 {
DuplicationDetection,
DwCALoader,
DwCACreator,
DwCAExporter,
DwcCSVLoader,
DebugRecord,
ExpertDistributionOutlierTool,
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/au/org/ala/biocache/export/DwCACreator.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ object DwCACreator extends Tool {
synchronized {
val dr = map.getOrElse("dataResourceUid", "")
val deletedDate = map.getOrElse("deletedDate", "")
if (dr != "" && resourceIDs.contains(dr) && deletedDate =="") {
if (dr != "" && resourceIDs.contains(dr) && deletedDate =="") { // Record is not deleted
val dataResourceMap = dataResource2OutputStreams.get(dr)
if (!dataResourceMap.isEmpty && !dataResourceMap.get.isEmpty){
val (zop, csv) = dataResourceMap.get.get
Expand Down
Loading

0 comments on commit 5c55b02

Please sign in to comment.