Skip to content

Commit

Permalink
Merge pull request #2636 from dzhw/release
Browse files Browse the repository at this point in the history
Release v1.0.103
  • Loading branch information
René Reitmann authored Sep 7, 2020
2 parents bacfb1d + b6e101b commit eca8ea5
Show file tree
Hide file tree
Showing 138 changed files with 3,365 additions and 3,137 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,8 @@ Desktop.ini
/docs/source/_static/.directory
.vscode/launch.json
.sts4-cache/**

######
# KDE
######
.directory
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: java
os:
- linux
jdk:
- openjdk13
- openjdk14
python:
- '2.7'
cache:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:13.0.2-slim
FROM openjdk:14.0.2-slim

MAINTAINER René Reitmann <[email protected]>

Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
[![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 Backend Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=pom.xml
)[![Known Frontend Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=package.json)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=package.json
)[![codecov](https://codecov.io/gh/dzhw/metadatamanagement/branch/development/graph/badge.svg)](https://codecov.io/gh/dzhw/metadatamanagement)[![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)
[![Sauce Test Status](https://app.saucelabs.com/browser-matrix/rreitmann.svg)](https://app.saucelabs.com/u/rreitmann)
# Metadatamanagement (MDM)

The MDM holds the metadata of the data packages which are available in our Research Data Center [FDZ](https://fdz.dzhw.eu). It enables researchers to browse our data packages before signing a contract for using the data.
Expand All @@ -19,7 +18,7 @@ Please checkout the development branch before starting to code and create a new

Before you can build this project, you must install and configure the following dependencies on your machine:

1. Java: You need to install java 13 sdk on your system. On Ubuntu you should use [SDKMAN!][]
1. Java: You need to install java 14 sdk on your system. On Ubuntu you should use [SDKMAN!][]
2. Maven: You need to install maven 3.6.1 or above on your system. On Ubuntu you should use [SDKMAN!][]
3. [Node.js][]: Node.js (latest) and npm (coming with node.js) are required as well. On Ubuntu you should install node using [NVM][]

Expand All @@ -33,7 +32,7 @@ On Windows, `patch.exe` has to exist in the PATH. It is distributed as part of g

Before starting the app on your local machine you need to start the following Document Stores:
1. Mongodb: Mongodb must be running on the default port, on ubuntu you should install it from here https://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/
2. Elasticsearch (7.7.0): Elasticsearch must be running on its default port. You can download it from here https://www.elastic.co/downloads/elasticsearch
2. Elasticsearch (7.9.1): Elasticsearch must be running on its default port. You can download it from here https://www.elastic.co/downloads/elasticsearch

Make sure that you have read-write-access on the ***data*** directory (in your project directory) for Elasticsearch.

Expand Down Expand Up @@ -83,7 +82,7 @@ Once Python is installed, run:
Note that the `--user` flag installs the dependency somewhere in your user directory (e.g. /home/{user}/local/bin on Linux). Make sure that the installed binaries/scripts are on your path.

We test our project continuously with the Robot Framework. Test Developers can get further info [here](https://github.com/dzhw/metadatamanagement/wiki/Robot-Framework).

## AWS Fargate
This project is currently built and deployed to AWS Fargate by [Travis CI][TravisCI]. You can test the latest version on https://dev.metadata.fdz.dzhw.eu/

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
ports:
- "27017:27017"
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.7.0
image: docker.elastic.co/elasticsearch/elasticsearch:7.9.1
container_name: elasticsearch
environment:
- discovery.type=single-node
Expand Down
Binary file removed docs/source/_static/01_de.png
Binary file not shown.
Binary file removed docs/source/_static/02_de.png
Binary file not shown.
Binary file removed docs/source/_static/13_de.png
Binary file not shown.
Binary file removed docs/source/_static/15_de.png
Binary file not shown.
Binary file removed docs/source/_static/16_de.png
Binary file not shown.
Binary file removed docs/source/_static/19_de.png
Binary file not shown.
Binary file removed docs/source/_static/20_de.png
Binary file not shown.
Binary file removed docs/source/_static/21_de.png
Binary file not shown.
Binary file removed docs/source/_static/25_de.png
Binary file not shown.
Binary file removed docs/source/_static/26_de.png
Binary file not shown.
Binary file removed docs/source/_static/29_de.png
Binary file not shown.
Binary file removed docs/source/_static/30_de.png
Binary file not shown.
Binary file removed docs/source/_static/31_de.png
Binary file not shown.
Binary file removed docs/source/_static/32_0.de.png
Binary file not shown.
Binary file removed docs/source/_static/34_0.png
Binary file not shown.
Binary file removed docs/source/_static/37_de.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/cockpit_studie_ready.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/concept_authors.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/concept_create.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/concept_description.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/concept_license.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/concept_tags.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/source/_static/dataset_overview_de.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/source/_static/datensatz_attachments.png
Binary file added docs/source/_static/ebenen_uebersicht_de.png
File renamed without changes
Binary file added docs/source/_static/historisation_de.png
Binary file added docs/source/_static/historization_undo.png
Binary file added docs/source/_static/history_dialog_de.png
Binary file added docs/source/_static/instrument_overview_de.png
Binary file modified docs/source/_static/instruments_anhang_dialog.png
Binary file removed docs/source/_static/nachricht_an_publisher.png
Diff not rendered.
Binary file modified docs/source/_static/projectcockpit_dataprovider_ready.png
Binary file modified docs/source/_static/projectcockpit_dataprovider_status_empty.png
Binary file modified docs/source/_static/projectcockpit_papierflieger.png
Binary file added docs/source/_static/recover_history_de.png
Binary file added docs/source/_static/registrierung_1_de.png
Binary file added docs/source/_static/registrierung_2_de.png
Binary file added docs/source/_static/rel_publication_de.png
File renamed without changes
Binary file removed docs/source/_static/studie_anlegen_per_suche.png
Diff not rendered.
Binary file removed docs/source/_static/studie_leer.png
Diff not rendered.
Binary file removed docs/source/_static/studie_ready.png
Diff not rendered.
Binary file added docs/source/_static/study_details_overview.png
Binary file added docs/source/_static/study_edit_details_page.png
Binary file added docs/source/_static/study_edit_details_tags.png
Binary file added docs/source/_static/study_edit_later.png
Binary file added docs/source/_static/study_empty.png
Binary file added docs/source/_static/study_historization.png
Binary file added docs/source/_static/survey_edit_de.png
Binary file added docs/source/_static/surveys_calendar.png
Binary file added docs/source/_static/surveys_edit-details-main.png
Binary file added docs/source/_static/surveys_public-view.png
110 changes: 0 additions & 110 deletions docs/source/excel_templates.rst

This file was deleted.

Loading

0 comments on commit eca8ea5

Please sign in to comment.