Skip to content

Commit

Permalink
Merge pull request #2323 from dzhw/release
Browse files Browse the repository at this point in the history
Release v1.0.88
  • Loading branch information
René Reitmann authored Aug 2, 2019
2 parents a31050f + bab29ae commit a9ae12c
Show file tree
Hide file tree
Showing 444 changed files with 10,269 additions and 6,872 deletions.
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ jobs:
- export CXX=g++-4.9
- export NODE_OPTIONS=--max-old-space-size=4096
- export MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.pl.project13.maven.git=WARN
- wget https://archive.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.zip
- unzip -qq apache-maven-3.6.1-bin.zip
- export M2_HOME=$PWD/apache-maven-3.6.1
- export PATH=$M2_HOME/bin:$PATH
- sudo apt-get -y install python-pip python-dev --allow-unauthenticated
- pip install git+https://github.com/dzhw/javasphinx.git --user
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 12.4.0
Expand All @@ -51,6 +55,10 @@ jobs:
- export CXX=g++-4.9
- export NODE_OPTIONS=--max-old-space-size=4096
- export MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.pl.project13.maven.git=WARN
- wget https://archive.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.zip
- unzip -qq apache-maven-3.6.1-bin.zip
- export M2_HOME=$PWD/apache-maven-3.6.1
- export PATH=$M2_HOME/bin:$PATH
- sudo apt-get -y install python-pip python-dev --allow-unauthenticated
- pip install git+https://github.com/dzhw/javasphinx.git --user
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 12.4.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,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 11 sdk on your system. On Ubuntu you should use [SDKMAN!][]
2. Maven: You need to install maven 3 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][]

We use [Grunt][] as our client build system. Install the grunt command-line tool globally with:
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"json3": "3.3.2",
"ng-file-upload": "12.2.13",
"elasticsearch": "15.4.1",
"jszip": "3.2.0",
"jszip": "3.2.2",
"file-saver.js": "~1.20150507.2",
"jszip-utils": "~0.0.2",
"jszip-utils": "~0.1.0",
"angular-translate-handler-log": "2.18.1",
"angular-nvd3": "^1.0.9",
"js-xlsx": "^0.14.0",
Expand Down
4 changes: 2 additions & 2 deletions deploy/build-and-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ if [ $? -ne 0 ]; then
exit -1
fi
if [ -z ${COVERALLS_TOKEN} ]; then
mvn --quiet -P${PROFILE} clean package
mvn --no-transfer-progress -P${PROFILE} clean package
else
mvn --quiet -P${PROFILE} clean -DrepoToken=$COVERALLS_TOKEN package coveralls:report
mvn --no-transfer-progress -P${PROFILE} clean -DrepoToken=$COVERALLS_TOKEN package coveralls:report
fi
if [ $? -ne 0 ]; then
echo "Maven build failed!"
Expand Down
4 changes: 2 additions & 2 deletions deploy/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ if [ -z ${PROFILE} ]; then
fi
echo "Going to run maven build with profile: ${PROFILE}"
if [ -z ${COVERALLS_TOKEN} ]; then
mvn -P${PROFILE} clean package
mvn --no-transfer-progress -P${PROFILE} clean package
else
mvn -P${PROFILE} clean -DrepoToken=$COVERALLS_TOKEN package coveralls:report
mvn --no-transfer-progress -P${PROFILE} clean -DrepoToken=$COVERALLS_TOKEN package coveralls:report
fi
if [ $? -ne 0 ]; then
echo "Maven build failed!"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.. java:import:: lombok Data
.. java:import:: java.io Serializable
.. java:import:: java.time LocalDateTime
.. java:import:: org.springframework.data.annotation CreatedBy
Expand All @@ -10,15 +12,15 @@
.. java:import:: org.springframework.data.annotation Version
.. java:import:: java.time LocalDateTime
.. java:import:: lombok Data
AbstractRdcDomainObject
=======================

.. java:package:: eu.dzhw.fdz.metadatamanagement.common.domain
:noindex:

.. java:type:: @Data public abstract class AbstractRdcDomainObject
.. java:type:: @Data public abstract class AbstractRdcDomainObject implements Serializable
Base class for all rdc domain objects. All domain objects inherit the fields from this base class.

Expand Down Expand Up @@ -56,6 +58,12 @@ lastModifiedDate

The date and time when this object was last saved.

serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: AbstractRdcDomainObject

version
^^^^^^^

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ AbstractShadowableRdcDomainObject

Fields
------
serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: AbstractShadowableRdcDomainObject

shadow
^^^^^^

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.. java:import:: java.io Serializable
.. java:import:: lombok AllArgsConstructor
.. java:import:: lombok Data
Expand All @@ -8,7 +10,7 @@ Country
.. java:package:: eu.dzhw.fdz.metadatamanagement.common.domain
:noindex:

.. java:type:: @Data @AllArgsConstructor public class Country
.. java:type:: @Data @AllArgsConstructor public class Country implements Serializable
Represents a country with it's 2-letter country code and it's display name in german and english.

Expand All @@ -32,3 +34,9 @@ en
.. java:field:: private String en
:outertype: Country

serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: Country

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.. java:import:: java.io Serializable
.. java:import:: org.javers.core.metamodel.annotation ValueObject
.. java:import:: lombok AllArgsConstructor
Expand All @@ -14,7 +16,7 @@ I18nString
.. java:package:: eu.dzhw.fdz.metadatamanagement.common.domain
:noindex:

.. java:type:: @NoArgsConstructor @Data @AllArgsConstructor @Builder @ValueObject public class I18nString
.. java:type:: @NoArgsConstructor @Data @AllArgsConstructor @Builder @ValueObject public class I18nString implements Serializable
Strings that can be represented in English and German.

Expand All @@ -36,3 +38,9 @@ en

The english version of this string.

serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: I18nString

Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,11 @@ ImmutableI18nString
Immutable (constant) version of \ :java:ref:`I18nString`\ s.

Fields
------
serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: ImmutableI18nString

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.. java:import:: java.io Serializable
.. java:import:: java.time LocalDate
.. java:import:: org.javers.core.metamodel.annotation ValueObject
Expand All @@ -18,7 +20,7 @@ Period
.. java:package:: eu.dzhw.fdz.metadatamanagement.common.domain
:noindex:

.. java:type:: @ValidPeriod @NoArgsConstructor @Data @AllArgsConstructor @Builder @ValueObject public class Period
.. java:type:: @ValidPeriod @NoArgsConstructor @Data @AllArgsConstructor @Builder @ValueObject public class Period implements Serializable
Objects representing periods in time. All periods must have a start date and an end date and the start date must be before or equal to the end date.

Expand All @@ -32,6 +34,12 @@ end

The end date of the period. Mandatory and must not be before start date.

serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: Period

start
^^^^^

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.. java:import:: java.io Serializable
.. java:import:: javax.validation.constraints NotEmpty
.. java:import:: org.javers.core.metamodel.annotation ValueObject
Expand All @@ -16,7 +18,7 @@ Person
.. java:package:: eu.dzhw.fdz.metadatamanagement.common.domain
:noindex:

.. java:type:: @NoArgsConstructor @Data @AllArgsConstructor @Builder @ValueObject public class Person
.. java:type:: @NoArgsConstructor @Data @AllArgsConstructor @Builder @ValueObject public class Person implements Serializable
A representation of a person.

Expand Down Expand Up @@ -46,3 +48,9 @@ middleName

The middle name of the person.

serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: Person

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.. java:import:: java.io Serializable
.. java:import:: javax.validation.constraints NotNull
.. java:import:: org.javers.core.metamodel.annotation ValueObject
Expand All @@ -16,7 +18,7 @@ Resolution
.. java:package:: eu.dzhw.fdz.metadatamanagement.common.domain
:noindex:

.. java:type:: @NoArgsConstructor @Data @AllArgsConstructor @Builder @ValueObject public class Resolution
.. java:type:: @NoArgsConstructor @Data @AllArgsConstructor @Builder @ValueObject public class Resolution implements Serializable
Representation of the resolution of images.

Expand All @@ -30,6 +32,12 @@ heightY

The height in pixel.

serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: Resolution

widthX
^^^^^^

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,11 @@ ShadowCopyCreateNotAllowedException
Exception that should be thrown if client tries to create a shadowed domain object.

Fields
------
serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: ShadowCopyCreateNotAllowedException

Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,11 @@ ShadowCopyDeleteNotAllowedException
Exception thrown if client tries to delete a shadowed domain object.

Fields
------
serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: ShadowCopyDeleteNotAllowedException

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ShadowCopySaveNotAllowedException
=================================

.. java:package:: eu.dzhw.fdz.metadatamanagement.common.domain
:noindex:

.. java:type:: public class ShadowCopySaveNotAllowedException extends IllegalArgumentException
Exception that should be thrown if a client tries to update a shadow version of a domain object.

Fields
------
serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: ShadowCopySaveNotAllowedException

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ location

The location URI of the result of the task.

serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: Task

state
^^^^^

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Common domain objects which can be used in all other subdomains of this applicat
Resolution
ShadowCopyCreateNotAllowedException
ShadowCopyDeleteNotAllowedException
ShadowCopyUpdateNotAllowedException
ShadowCopySaveNotAllowedException
Task
Task-TaskState
Task-TaskType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ originalLanguages

The original languages of the definition of the concept as ISO 639 code. Must not be empty.

serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: Concept

tags
^^^^

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ language

The language of the attachments content. Must not be empty and must be specified as ISO 639 language code.

serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: ConceptAttachmentMetadata

title
^^^^^

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. java:import:: lombok Getter
.. java:import:: java.util Set
.. java:import:: lombok Getter
ConceptInUseException
=====================

Expand All @@ -26,3 +26,9 @@ questionIds
.. java:field:: @Getter private final Set<String> questionIds
:outertype: ConceptInUseException

serialVersionUID
^^^^^^^^^^^^^^^^

.. java:field:: private static final long serialVersionUID
:outertype: ConceptInUseException

Loading

0 comments on commit a9ae12c

Please sign in to comment.