Merge pull request #6 from mpassid/updateVersion

Update IdP version 5

Author: JarToi

README.md

@@ -7,14 +7,14 @@
 ## Overview
 
 This module is a [Data Connector](https://shibboleth.atlassian.net/wiki/spaces/IDP4/pages/1265631864/AttributeResolver)
-plugin for [Shibboleth Identity Provider v4](https://shibboleth.atlassian.net/wiki/spaces/IDP4/). It
+plugin for [Shibboleth Identity Provider v5](https://shibboleth.atlassian.net/wiki/spaces/IDP5/overview). It
 implements the user attribute resolution from ECA Auth Data -module, as defined in [EduCloud Alliance's](https://portal.educloudalliance.org/) [ECA Authentication](https://github.com/educloudalliance/eca-docs/blob/master/auth/index.rst) standard. In short, this module
 resolves the user attributes via a specific REST API, using two attributes as a hook to the user object stored
 behind the API. In the ECA Auth standard context, those two attributes are [AuthnID](https://github.com/mpassid/shibboleth-idp-attribute-authnid) and IdP identifier.
 
 ## Prerequisities and compilation
 
-- Java 11+
+- Java 17+
 - [Apache Maven 3](https://maven.apache.org/)
 
 ```

pom.xml

@@ -26,26 +26,25 @@ THE SOFTWARE.
     <parent>
         <groupId>net.shibboleth.idp</groupId>
         <artifactId>idp-parent</artifactId>
-        <version>4.2.1</version>
+        <version>5.0.0</version>
     </parent>
 
     <groupId>fi.mpass</groupId>
-    <version>1.4</version>
+    <version>1.5</version>
     <packaging>jar</packaging>
     <artifactId>idp-attribute-impl-ecadata</artifactId>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <shib.idp.version>4.2.1</shib.idp.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <shib.idp.version>5.0.0</shib.idp.version>
         <commons-io.version>2.7</commons-io.version>
         <gson.version>2.9.0</gson.version>
         <simpleframework.version>6.0.1</simpleframework.version>
         <checkstyle.configLocation>mpassid-checkstyle.xml</checkstyle.configLocation>
         <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
-        <automatic.module.name>fi.mpass.shibboleth.attribute.dc.rest</automatic.module.name>
-        <fi.csc.shibboleth.shibsp>1.0.0</fi.csc.shibboleth.shibsp>
+        <automatic.module.name>fi.mpass.shibboleth.attribute.dc.rest</automatic.module.name>        
     </properties>
 
     <repositories>
@@ -83,18 +82,18 @@ THE SOFTWARE.
     <dependencies>
         <!-- Compile Dependencies -->
         <dependency>
-            <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-attribute-api</artifactId>
+            <groupId>net.shibboleth</groupId>
+            <artifactId>shib-attribute-api</artifactId>
             <version>${shib.idp.version}</version>
         </dependency>
         <dependency>
-            <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-attribute-resolver-api</artifactId>
+            <groupId>net.shibboleth</groupId>
+            <artifactId>shib-attribute-resolver-api</artifactId>
             <version>${shib.idp.version}</version>
         </dependency>
         <dependency>
-            <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-attribute-resolver-spring</artifactId>
+            <groupId>net.shibboleth</groupId>
+            <artifactId>shib-attribute-resolver-spring</artifactId>
             <version>${shib.idp.version}</version>
         </dependency>
         <dependency>
@@ -108,11 +107,6 @@ THE SOFTWARE.
             <version>${shib.idp.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <version>${opensaml.version}</version>
-        </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-profile-api</artifactId>
@@ -123,16 +117,13 @@ THE SOFTWARE.
             <artifactId>opensaml-soap-api</artifactId>
             <version>${opensaml.version}</version>
         </dependency>
-        <dependency>
-            <groupId>fi.csc.shibboleth</groupId>
-            <artifactId>idp-authn-api-shibsp</artifactId>
-            <version>${fi.csc.shibboleth.shibsp}</version>
-        </dependency>
+        
 
 
         <dependency>
             <groupId>net.shibboleth.ext</groupId>
             <artifactId>spring-extensions</artifactId>
+            <version>${shib.idp.version}</version>
         </dependency>
 
         <dependency>
@@ -153,22 +144,26 @@ THE SOFTWARE.
             <artifactId>commons-io</artifactId>
             <version>${commons-io.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
 
         <!-- Test Dependencies -->
         <dependency>
-            <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-attribute-resolver-impl</artifactId>
+            <groupId>net.shibboleth</groupId>
+            <artifactId>shib-attribute-resolver-impl</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
             <version>${shib.idp.version}</version>
         </dependency>
         <dependency>
-            <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-attribute-resolver-spring</artifactId>
+            <groupId>net.shibboleth</groupId>
+            <artifactId>shib-attribute-resolver-spring</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
             <version>${shib.idp.version}</version>
@@ -188,10 +183,16 @@ THE SOFTWARE.
             <version>${shib.idp.version}</version>
         </dependency>
 
+        <dependency>
+			<groupId>net.shibboleth.idp</groupId>
+			<artifactId>idp-testing</artifactId>
+			<version>${shib.idp.version}</version>
+			<scope>test</scope>
+		</dependency>
+
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-core</artifactId>
-            <type>test-jar</type>
+            <artifactId>opensaml-testing</artifactId>
             <scope>test</scope>
             <version>${opensaml.version}</version>
         </dependency>

src/main/java/fi/mpass/shibboleth/attribute/resolver/data/UserDTO.java

@@ -27,7 +27,7 @@
 
 import com.google.gson.annotations.SerializedName;
 
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.logic.Constraint;
 
 /**
  * This class defines the data transfer object for the communication with ECA