[syncope] 09/09: [SYNCOPE-1545] Using CAS BOM

[il...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 80b941e0ace052034995b86315b95bdb482923c8
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Mar 16 14:05:06 2020 +0100

    [SYNCOPE-1545] Using CAS BOM
---
 wa/pom.xml                                              | 17 ++++++++++++++---
 .../syncope/wa/config/SyncopeWAConfiguration.java       | 11 ++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/wa/pom.xml b/wa/pom.xml
index 1a5616d..8cb9d18 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -41,6 +41,18 @@ under the License.
     <rootpom.basedir>${basedir}/..</rootpom.basedir>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apereo.cas</groupId>
+        <artifactId>cas-server-support-bom</artifactId>
+        <version>${cas.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.syncope.common.keymaster</groupId>
@@ -132,9 +144,8 @@ under the License.
       <artifactId>cas-server-support-reports</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apereo.cas</groupId>
-        <artifactId>cas-server-support-syncope-authentication</artifactId>
-        <scope>compile</scope>
+      <groupId>org.apereo.cas</groupId>
+      <artifactId>cas-server-support-syncope-authentication</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apereo.cas</groupId>
diff --git a/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java b/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
index 2107f51..701cb53 100644
--- a/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
+++ b/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
@@ -6,7 +6,8 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -14,26 +15,26 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- *
  */
-
 package org.apache.syncope.wa.config;
 
+import java.io.Serializable;
 import org.apereo.cas.services.DefaultRegisteredServiceEntityMapper;
 import org.apereo.cas.services.RegisteredServiceEntityMapper;
-
 import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
 import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStart;
 import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStop;
+import org.apereo.cas.services.RegisteredService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
 public class SyncopeWAConfiguration {
+
     @Bean
     @ConditionalOnProperty(name = "cas.serviceRegistry.rest.url")
-    public RegisteredServiceEntityMapper registeredServiceEntityMapper() {
+    public RegisteredServiceEntityMapper<RegisteredService, Serializable> registeredServiceEntityMapper() {
         return new DefaultRegisteredServiceEntityMapper();
     }