Merge pull request #2218 from dzhw/release

Release v1.0.84
dzhw · May 13, 2019 · 5a49ef1 · 5a49ef1
2 parents 6936f4d + 28c62f3
commit 5a49ef1
Show file tree

Hide file tree

Showing 930 changed files with 72,982 additions and 35,319 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -0,0 +1,8 @@
+pull_request_rules:
+  - name: automatic merge of development PRs into test
+    conditions:
+      - base=test
+      - status-success=continuous-integration/travis-ci/push
+    actions:
+      merge:
+        method: merge
diff --git a/.travis.yml b/.travis.yml
@@ -68,21 +68,25 @@ jobs:
       install:
         - ./src/test/robotframework/setup.sh
       script:
+        - export PYTHONWARNINGS="ignore"
         - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include smoketest --exclude firefoxonly ./src/test/robotframework
     - name: "Firefox Smoketest"
       install:
         - ./src/test/robotframework/setup.sh
       script:
+        - export PYTHONWARNINGS="ignore"
         - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include smoketest --exclude chromeonly ./src/test/robotframework
     - name: "Edge Smoketest"
       install:
         - ./src/test/robotframework/setup.sh
       script:
+        - export PYTHONWARNINGS="ignore"
         - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v USE_SAUCELABS:TRUE -v BROWSER:edge --include smoketest --exclude firefoxonly --exclude chromeonly --exclude noslowpoke ./src/test/robotframework
     - name: "IE11 Smoketest"
       install:
         - ./src/test/robotframework/setup.sh
       script:
+        - export PYTHONWARNINGS="ignore"
         - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v USE_SAUCELABS:TRUE -v BROWSER:ie --include smoketest --exclude firefoxonly --exclude chromeonly --exclude noslowpoke ./src/test/robotframework
     - stage: nightly e2e tests publicuser
       name: "Nightly Chrome Tests (Public User)"

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/dzhw/metadatamanagement.svg?branch=master)](https://travis-ci.org/dzhw/metadatamanagement) [![Documentation Status](https://readthedocs.org/projects/metadatamanagement/badge/?version=latest)](https://metadatamanagement.readthedocs.io/de/latest/?badge=latest) [![Sauce Test Status](https://saucelabs.com/buildstatus/rreitmann)](https://saucelabs.com/u/rreitmann)
 [![Known Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=pom.xml
-)[![Coverage Status](https://coveralls.io/repos/dzhw/metadatamanagement/badge.svg?branch=master&service=github)](https://coveralls.io/github/dzhw/metadatamanagement?branch=master)
+)[![Coverage Status](https://coveralls.io/repos/dzhw/metadatamanagement/badge.svg?branch=master&service=github)](https://coveralls.io/github/dzhw/metadatamanagement?branch=master) [![Mergify Status](https://gh.mergify.io/badges/dzhw/metadatamanagement.png?style=cut)](https://mergify.io)
 [![DOI](https://zenodo.org/badge/39431147.svg)](https://zenodo.org/badge/latestdoi/39431147)
 
 [![Sauce Build Matrix](https://saucelabs.com/browser-matrix/rreitmann.svg)](https://saucelabs.com/u/rreitmann)

diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "appPath": "src/main/webapp",
   "testPath": "src/test/javascript/spec",
   "dependencies": {
-    "jquery": "^3.3.1",
+    "jquery": "^3.4.1",
     "angular": "1.7.8",
     "angular-aria": "1.7.8",
     "angular-bootstrap": "2.5.0",
@@ -29,13 +29,13 @@
     "angular-nvd3": "^1.0.9",
     "js-xlsx": "^0.14.0",
     "cheet.js": "^0.3.3",
-    "angular-material": "1.1.17",
+    "angular-material": "1.1.18",
     "angular-block-ui": "^0.2.2",
     "lodash": "^4.17.11",
-    "plotly.js": "1.46.1",
+    "plotly.js": "1.47.4",
     "highlightjs": "^9.12.0",
     "angular-highlightjs": "^0.7.1",
-    "js-beautify": "^1.9.1",
+    "js-beautify": "^1.10.0",
     "ngclipboard": "^2.0.0",
     "angular-katex": "^0.10.0",
     "angular-animate": "^1.7.8",
@@ -46,7 +46,7 @@
     "angular-scroll": "^1.0.2",
     "sockjs-client": "^1.3.0",
     "stomp-websocket": "^2.3.4",
-    "es5-shim": "^4.5.12",
+    "es5-shim": "^4.5.13",
     "es6-shim": "^0.35.5",
     "hyphenator": "Hyphenator#^5.3.0",
     "ng-shortcut": "^0.1.4",

diff --git a/deploy/build-and-deploy.sh b/deploy/build-and-deploy.sh
@@ -42,7 +42,7 @@ if [ $? -ne 0 ]; then
     echo "Maven build failed!"
     exit -1
 fi
-cf push -f ./deploy/manifest-${PROFILE}.yml
+cf push -f ./deploy/manifest-${PROFILE}.yml -s cflinuxfs3
 if [ $? -ne 0 ]; then
     echo "cf push failed!"
     exit -1

diff --git a/deploy/deploy.sh b/deploy/deploy.sh
@@ -28,7 +28,7 @@ if [ $? -ne 0 ]; then
     echo "cf login failed!"
     exit -1
 fi
-cf push -f ./deploy/manifest-${PROFILE}.yml
+cf push -f ./deploy/manifest-${PROFILE}.yml -s cflinuxfs3
 if [ $? -ne 0 ]; then
     echo "cf push failed!"
     exit -1

diff --git a/...vadoc/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/Configuration.rst b/...vadoc/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/Configuration.rst
@@ -56,6 +56,14 @@ instrumentsState
 
    The state of instruments.
 
+publicationsState
+^^^^^^^^^^^^^^^^^
+
+.. java:field:: private ProjectState publicationsState
+   :outertype: Configuration
+
+   The state of related publications.
+
 publishers
 ^^^^^^^^^^
 

diff --git a/...avadoc/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/Requirements.rst b/...avadoc/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/Requirements.rst
@@ -1,3 +1,5 @@
+.. java:import:: java.io Serializable
+
 .. java:import:: javax.validation.constraints AssertTrue
 
 .. java:import:: org.javers.core.metamodel.annotation ValueObject
@@ -16,8 +18,6 @@
 
 .. java:import:: lombok Setter
 
-.. java:import:: java.io Serializable
-
 Requirements
 ============
 
@@ -46,6 +46,14 @@ isInstrumentsRequired
 
    Defines if instrument data is required for a release.
 
+isPublicationsRequired
+^^^^^^^^^^^^^^^^^^^^^^
+
+.. java:field:: private boolean isPublicationsRequired
+   :outertype: Requirements
+
+   Defines if publication data is required for a release.
+
 isQuestionsRequired
 ^^^^^^^^^^^^^^^^^^^
 

diff --git a/...z/metadatamanagement/relatedpublicationmanagement/domain/RelatedPublication.rst b/...z/metadatamanagement/relatedpublicationmanagement/domain/RelatedPublication.rst
@@ -32,10 +32,6 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation InstrumentExists
 
-.. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation OneForeignKeyIsUsed
-
-.. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation OneStudyOrStudySeriesIsUsed
-
 .. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation QuestionExists
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation StudyExists
@@ -48,16 +44,6 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation ValidRelatedPublicationId
 
-.. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation ValidStudyIdsForDataSetIds
-
-.. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation ValidStudyIdsForInstrumentIds
-
-.. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation ValidStudyIdsForQuestionIds
-
-.. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation ValidStudyIdsForSurveyIds
-
-.. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation ValidStudyIdsForVariableIds
-
 .. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation ValidUrl
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation VariableExists
@@ -82,7 +68,7 @@ RelatedPublication
 .. java:package:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain
    :noindex:
 
-.. java:type:: @Document @OneForeignKeyIsUsed @OneStudyOrStudySeriesIsUsed @ValidPublicationYear @ValidRelatedPublicationId @ValidStudyIdsForSurveyIds @ValidStudyIdsForDataSetIds @ValidStudyIdsForVariableIds @ValidStudyIdsForInstrumentIds @ValidStudyIdsForQuestionIds @EqualsAndHashCode @ToString @NoArgsConstructor @Data @AllArgsConstructor @Builder public class RelatedPublication extends AbstractRdcDomainObject
+.. java:type:: @Document @ValidPublicationYear @ValidRelatedPublicationId @EqualsAndHashCode @ToString @NoArgsConstructor @Data @AllArgsConstructor @Builder public class RelatedPublication extends AbstractRdcDomainObject
 
    Domain Object for the Related Publications.