Merge branch 'datasetRole' into 'master'

Added dataset.editors and dataset.viewers role

See merge request !90

NOTICE

@@ -108,7 +108,6 @@ The following software have components provided under the terms of this license:
 - Google OAuth Client Library for Java (from )
 - Gson (from https://github.com/google/gson)
 - Guava InternalFutureFailureAccess and InternalFutures (from )
-- Guava ListenableFuture only (from )
 - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
 - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
 - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
@@ -126,7 +125,6 @@ The following software have components provided under the terms of this license:
 - JBoss Threads (from )
 - JCIP Annotations under Apache License (from http://stephenc.github.com/jcip-annotations)
 - JCL 1.1.1 implemented over SLF4J (from http://www.slf4j.org)
-- JLine (from )
 - JMES Path Query library (from https://aws.amazon.com/sdkforjava)
 - JSON Small and Fast Parser (from http://www.minidev.net/)
 - JSON Small and Fast Parser (from http://www.minidev.net/)
@@ -180,7 +178,6 @@ The following software have components provided under the terms of this license:
 - Mockito (from http://mockito.org)
 - Netty Reactive Streams HTTP support (from )
 - Netty Reactive Streams Implementation (from )
-- Netty Reactive Streams Implementation (from )
 - Netty/All-in-One (from )
 - Netty/Buffer (from http://netty.io/)
 - Netty/Codec (from )
@@ -361,6 +358,7 @@ The following software have components provided under the terms of this license:
 - Jodd BeanUtil (from http://jodd.org)
 - Jodd Core (from http://jodd.org)
 - Jodd Core (from http://jodd.org)
+- Reflections (from http://github.com/ronmamo/reflections)
 - Stax2 API (from http://github.com/FasterXML/stax2-api)
 - ThreeTen backport (from https://www.threeten.org/threetenbp)
 
@@ -406,7 +404,6 @@ The following software have components provided under the terms of this license:
 - Reflections (from http://github.com/ronmamo/reflections)
 - SnakeYAML (from http://www.snakeyaml.org)
 - Spring Core (from https://github.com/spring-projects/spring-framework)
-- Stax2 API (from http://github.com/FasterXML/stax2-api)
 - ThreeTen backport (from https://www.threeten.org/threetenbp)
 - jakarta.xml.bind-api (from )
 - jbcrypt (from http://www.mindrot.org/)
@@ -438,19 +435,13 @@ The following software have components provided under the terms of this license:
 
 - reactive-streams (from http://www.reactive-streams.org/)
 
-========================================================================
-CDDL-1.0
-========================================================================
-The following software have components provided under the terms of this license:
-
-- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
-
 ========================================================================
 CDDL-1.1
 ========================================================================
 The following software have components provided under the terms of this license:
 
 - JavaBeans Activation Framework (from )
+- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
 - tomcat-embed-core (from http://tomcat.apache.org/)
 - tomcat-embed-core (from http://tomcat.apache.org/)
 
@@ -461,6 +452,13 @@ The following software have components provided under the terms of this license:
 
 - JUnit (from http://junit.org)
 
+========================================================================
+DOC
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Woodstox (from https://github.com/FasterXML/woodstox)
+
 ========================================================================
 EPL-1.0
 ========================================================================
@@ -559,6 +557,14 @@ The following software have components provided under the terms of this license:
 
 - jbcrypt (from http://www.mindrot.org/)
 
+========================================================================
+ImageMagick
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Stax2 API (from http://github.com/FasterXML/stax2-api)
+- Woodstox (from https://github.com/FasterXML/woodstox)
+
 ========================================================================
 JSON
 ========================================================================
@@ -589,6 +595,7 @@ The following software have components provided under the terms of this license:
 
 - JBoss Threads (from )
 - Javassist (from http://www.javassist.org/)
+- Javassist (from http://www.javassist.org/)
 - SnakeYAML (from http://www.snakeyaml.org)
 
 ========================================================================
@@ -685,10 +692,6 @@ Public-Domain
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
-- Joda-Time (from http://www.joda.org/joda-time/)
-- Joda-Time (from http://www.joda.org/joda-time/)
-- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
 - Spongy Castle (from http://rtyley.github.io/spongycastle/)
 
 ========================================================================
@@ -721,7 +724,10 @@ The following software have components provided under the terms of this license:
 - Asynchronous Http Client (from )
 - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
 - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
+- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
 - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
+- Joda-Time (from http://www.joda.org/joda-time/)
+- Joda-Time (from http://www.joda.org/joda-time/)
 - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
 - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
 - Microsoft Azure SDK for EventGrid Management (from https://github.com/Azure/azure-sdk-for-java)
@@ -742,6 +748,7 @@ The following software have components provided under the terms of this license:
 
 - Byte Buddy (without dependencies) (from )
 - Checker Qual (from https://checkerframework.org)
+- JSON in Java (from https://github.com/douglascrockford/JSON-java)
 - JUnit (from http://junit.org)
 - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
 - JavaBeans Activation Framework API jar (from )

provider/entitlements-v2-azure/src/main/resources/provisioning/groups/datalake_service_groups.json

@@ -329,6 +329,39 @@
           "name": "users.datalake.admins"
         }
       ]
+    },
+    {
+      "name": "service.dataset.editors",
+      "description": "Editors group for Dataset service",
+      "members": [
+        {
+          "name": "users.datalake.ops"
+        },
+        {
+          "name": "users.datalake.editors"
+        },
+        {
+          "name": "users.datalake.admins"
+        }
+      ]
+    },
+    {
+      "name": "service.dataset.viewers",
+      "description": "Viewers group for Dataset service",
+      "members": [
+        {
+          "name": "users.datalake.ops"
+        },
+        {
+          "name": "users.datalake.editors"
+        },
+        {
+          "name": "users.datalake.admins"
+        },
+        {
+          "name": "users.datalake.viewers"
+        }
+      ]
     }
   ]
 }

provider/entitlements-v2-azure/src/test/java/org/opengroup/osdu/entitlements/v2/azure/workflow/CreateMembershipsWorkflowSinglePartitionTest.java

@@ -933,6 +933,7 @@ public class CreateMembershipsWorkflowSinglePartitionTest {
                 "service.entitlements.user@common.contoso.com", "service.search.admin@common.contoso.com",
                 "service.storage.admin@common.contoso.com", "users.datalake.viewers@common.contoso.com",
                 "service.storage.creator@common.contoso.com", "service.workflow.admin@common.contoso.com",
-                "data.default.viewers@common.contoso.com"}, performListGroupRequest(servicePrincipal));
+                "data.default.viewers@common.contoso.com", "service.dataset.editors@common.contoso.com",
+                "service.dataset.viewers@common.contoso.com"}, performListGroupRequest(servicePrincipal));
     }
 }