Merge branch 'dev'
Change-Id: I4c2445b1a532cee0f940ad11a8d8aa7f9fddf3db
diff --git a/NOTICE.txt b/NOTICE.txt
index 5de48b2..56281c6 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -16,14 +16,15 @@
For more information regarding authorship of content, please consult the listed
source code repository logs.
-Copyright (c) 2016-2018 Gigatronik Ingolstadt GmbH
-Copyright (c) 2016-2019 Peak Solution GmbH
+Copyright (c) 2016-2019 Gigatronik Ingolstadt GmbH
+Copyright (c) 2016-2020 Peak Solution GmbH
Copyright (c) 2017-2018 science + computing AG Tuebingen (ATOS SE)
Copyright (c) 2017-2018 Canoo Engineering AG
Copyright (c) 2017 Florian Schmitt
-Copyright (c) 2017-2019 Angelika Wittek
-Copyright (c) 2018 Elektronische Fahrwerksysteme GMBH
-Copyright (c) 2018-2019 Karakun AG
+Copyright (c) 2017-2020 Angelika Wittek
+Copyright (c) 2018-2019 Elektronische Fahrwerksysteme GMBH
+Copyright (c) 2018-2020 Karakun AG
+Copyright (c) 2018-2020 Alexander Nehmer
## Declared Project Licenses
@@ -37,7 +38,7 @@
The project maintains the following source code repositories:
-org.eclipse.mdm.api.base.git - The openMDM(R) API.
+org.eclipse.mdm.api.base.git - The openMDM(R) API.
org.eclipse.mdm.api.default.git - Extension of the openMDM(R) API containing default elements.
org.eclipse.mdm.api.odsadapter.git - ODS implementation of persistence adapter.
org.eclipse.mdm.nucleus.git - Core building blocks for the openMDM Business Logic and Web Frontend.
@@ -67,9 +68,6 @@
commons-text-1.6.jar (1.6)
* License: Apache License, 2.0
-commons-math-2.2.jar (2.2)
- * License: Apache License, 2.0
-
gson-2.7.jar (2.7)
* License: Apache License, 2.0
@@ -85,7 +83,7 @@
hk2-locator-2.5.0-b05.jar(2.5.0-b05)
* License: CDDL
-hk2-utils-2.5.0-b05.jar (2.5.0-b05)
+hk2-utils-2.5.0-b05.jar (2.5.0-b05)
* License: CDDL
jackson-annotations-2.9.0.jar (2.9.0)
@@ -151,6 +149,9 @@
logback-core-1.2.3.jar(1.2.3)
* License: Eclipse Public License 1.0
+mimepull-1.9.6.jar (1.9.4)
+ * License: CDDL
+
openatfx-0.7.4.jar (0.7.4)
* License: Apache-2.0
@@ -163,18 +164,30 @@
protobuf-java-util-3.2.0.jar (3.2.0)
* License: New BSD license
+swagger-annotations-2.0.8.jar (2.0.8)
+ * License: Apache-2.0
+
+swagger-ui-3.23.0.jar (3.23.0)
+ * License: Apache-2.0
+
slf4j-api-1.7.25.jar (1.7.25)
* License: MIT license
* Licence Path: https://www.slf4j.org/license.html
* Project URL: https://github.com/qos-ch/slf4j
* Source URL: https://github.com/qos-ch/slf4j/releases/tag/v_1.7.25
+stax2-api-3.1.4.jar (3.1.4)
+ * License: BSD-2-Clause
+
validation-api-1.1.0.Final.jar (1.1.0.Final)
* License: Apache License, 2.0
vavr-0.9.1-sources.jar (0.9.1)
* License: Apache License, 2.0
+vavr-match-0.9.1.jar (0.9.1)
+ * License: Apache License, 2.0
+
woodstox-core-asl-4.4.1.jar (4.4.1)
* License: Apache License, 2.0
@@ -288,6 +301,18 @@
* Project: https://valor-software.com/ngx-bootstrap
* Source: https://github.com/valor-software/ngx-bootstrap/tree/v3.1.2
+@ngx-translate/core@11.0.1
+ * License: MIT
+ * Licence Path: https://github.com/ngx-translate/core/blob/v11.0.1/LICENSE
+ * Project URL: http://www.ngx-translate.com/
+ * Source URL: https://github.com/ngx-translate/core
+
+@ngx-translate/http-loader@4.0.0
+ * License: MIT
+ * Licence Path: https://github.com/ngx-translate/http-loader/blob/v4.0.0/LICENSE
+ * Project URL: http://www.ngx-translate.com/
+ * Source URL: https://github.com/ngx-translate/http-loader/tree/v4.0.0
+
primeicons:1.0.0
* License: MIT
* Licence Path: https://github.com/primefaces/primeicons/blob/1.0.0/LICENSE
@@ -300,7 +325,7 @@
* Project: https://www.primefaces.org/primeng
* Source: https://github.com/primefaces/primeng/tree/7.0.1
-rxjs@5.1.0
+rxjs@6.3.3
* License: Apache-2.0
* Project: https://rxjs-dev.firebaseapp.com/
* Source: https://github.com/ReactiveX/rxjs/tree/6.3.3
@@ -310,6 +335,10 @@
* Project: https://rxjs-dev.firebaseapp.com/
* Source: https://github.com/ReactiveX/rxjs/tree/6.3.3/compat
+tslib@1.9.0
+ * License: Apache-2.0
+ * Project: https://github.com/Microsoft/tslib
+ * Source: https://github.com/Microsoft/tslib/tree/1.9.0
zone.js@0.8.26
* License: MIT
@@ -330,17 +359,12 @@
* Source: https://www.omg.org/spec/NOT/1.1/PDF
ods530.idl
-Permission of use:
-From Hans-Georg Swolana, Chairman of the Board ASAM e.V.,
- Prof. Dr. Marcus Rieker, Member of the Board ASAM e.V.
Date: Hoehenkirchen, 06/01/2016
"The ASAM Board of Directors releases the IDL files for use under the EPL to the Eclipse IWG openMDM.
This is valid for all versions of ASAM ODS 5.3.x.
This permission is valid under the conditions of Eclipse will not modify the file."
AvalonEvent.idl, CorbaFileServer.idl
-Permission of use:
-From Dr. Ralph Noerenberg
Date: 08/15/2016
"Herewith, we release the generated Client-Source-Code generated from our CORBA IDLs, namely
* CORBANotification Service (generated from „AvalonEvent.idl”)
diff --git a/build.gradle b/build.gradle
index c6f5b7a..2dde0a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@
description = 'MDM API - Base Model'
group = 'org.eclipse.mdm'
-version = '5.1.0M7'
+version = '5.1.0M8-SNAPSHOT'
apply plugin: 'java'
apply plugin: 'maven'
diff --git a/src/main/java/org/eclipse/mdm/api/base/query/Query.java b/src/main/java/org/eclipse/mdm/api/base/query/Query.java
index 41e21af..104f297 100644
--- a/src/main/java/org/eclipse/mdm/api/base/query/Query.java
+++ b/src/main/java/org/eclipse/mdm/api/base/query/Query.java
@@ -296,6 +296,14 @@
Query order(Attribute attribute, boolean ascending);
/**
+ * Sets the maximum number of rows fetched by the query. 0 denotes no limit.
+ *
+ * @param limit number of maximum rows.
+ * @return This query is returned.
+ */
+ Query limit(int limit);
+
+ /**
* Executes this query with an empty {@link Filter} and returns the
* {@link Result}.
*
