From e915685e22c7c084f7fd0c4870ff20d3f0194a91 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Thu, 31 Aug 2023 20:37:42 +0200
Subject: feat(core): refactor to openSAML 5 for Java 17

---
 pom.xml | 59 ++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 36ce80a4..c7cdb699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   <properties>
     <!-- General project properties -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>1.8</java.version>
+    <java.version>17</java.version>
 
     <!-- Project versions -->
     <egiz.eaaf.version>${project.version}</egiz.eaaf.version>
@@ -23,7 +23,7 @@
     <at.gv.egiz.components.eventlog-api.version>0.4</at.gv.egiz.components.eventlog-api.version>
     <at.gv.egiz.components.egiz-spring-api>0.3.1</at.gv.egiz.components.egiz-spring-api>
 
-    <MOA.spss.server.moa-sig-lib.version>3.1.9</MOA.spss.server.moa-sig-lib.version>
+    <MOA.spss.server.moa-sig-lib.version>3.2.2</MOA.spss.server.moa-sig-lib.version>
     <MOA.spss.tsl_lib.version>2.1.1</MOA.spss.tsl_lib.version>
 
     <!-- IAIK libs -->
@@ -48,8 +48,8 @@
     <!-- Other third-party libs -->
     <spring-boot-starter-web.version>3.0.5</spring-boot-starter-web.version>
     <org.springframework.version>6.0.8</org.springframework.version>
-    <org.apache.tomcat.embed.version>9.0.73</org.apache.tomcat.embed.version>
-    <org.opensaml.version>4.0.1</org.opensaml.version>
+    <org.apache.tomcat.embed.version>10.1.13</org.apache.tomcat.embed.version>
+    <org.opensaml.version>5.0.0-SNAPSHOT</org.opensaml.version>
     <org.apache.santuario.xmlsec.version>2.3.2</org.apache.santuario.xmlsec.version>
     <org.cryptacular.version>1.2.5</org.cryptacular.version>
     <org.bouncycastle.bcprov-jdk18on.version>1.71.1</org.bouncycastle.bcprov-jdk18on.version>
@@ -65,19 +65,18 @@
     <org.apache.commons-collections>3.2.2</org.apache.commons-collections>
     <org.apache.commons-collections4>4.4</org.apache.commons-collections4>
     <commons-io.version>2.11.0</commons-io.version>
-    <commons-fileupload.version>1.5</commons-fileupload.version>
+    <commons-fileupload2.version>2.0.0-M1</commons-fileupload2.version>
 
-    <jakarta.servlet-api>4.0.4</jakarta.servlet-api>
+    <jakarta.servlet-api>6.0.0</jakarta.servlet-api>
     
     <org.apache.velocity.version>2.3</org.apache.velocity.version>
-    <javax.annotation-api>1.3.2</javax.annotation-api>
+    <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
     <joda-time.version>2.12.2</joda-time.version>
     <jsr305.version>3.0.2</jsr305.version>
     <com.google.guava.version>31.1-jre</com.google.guava.version>
     <org.owasp.encoder.version>1.2.3</org.owasp.encoder.version>
 
-    <httpclient.version>4.5.14</httpclient.version>
-    <httpcore.version>4.4.16</httpcore.version>
+    <httpclient.version>5.2.1</httpclient.version>
 
     <com.fasterxml.jackson.core.version>2.15.0</com.fasterxml.jackson.core.version>
     <com.fasterxml.jackson.databind.version>2.15.0</com.fasterxml.jackson.databind.version>
@@ -167,6 +166,17 @@
       <name>Internet2</name>
       <url>https://build.shibboleth.net/nexus/content/groups/public/</url>
     </repository>
+    <repository>
+		<id>shibboleth.internet2.edu.snapshot</id>
+      	<name>Shibboleth Snapshot repo</name>
+		<url>https://build.shibboleth.net/maven/snapshots/</url>
+		<releases>
+        	<enabled>false</enabled>
+      	</releases>
+      	<snapshots>
+        	<enabled>true</enabled>
+      	</snapshots>
+	</repository>
   </repositories>
 
   <profiles>
@@ -448,11 +458,11 @@
         <version>${io.grpc-core.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <version>${javax.annotation-api}</version>
-      </dependency>
+	  <dependency>
+    	<groupId>jakarta.annotation</groupId>
+    	<artifactId>jakarta.annotation-api</artifactId>
+    	<version>${jakarta.annotation-api.version}</version>
+	  </dependency>
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
@@ -552,9 +562,9 @@
         <version>${org.apache.commons-text.version}</version>
       </dependency>
       <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <version>${commons-fileupload.version}</version>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-fileupload2-jakarta</artifactId>
+        <version>${commons-fileupload2.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opensaml</groupId>
@@ -631,16 +641,11 @@
         <version>${xalan.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient</artifactId>
-        <version>${httpclient.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore</artifactId>
-        <version>${httpcore.version}</version>
-      </dependency>
+	  <dependency>
+    	<groupId>org.apache.httpcomponents.client5</groupId>
+    	<artifactId>httpclient5</artifactId>
+    	<version>${httpclient.version}</version>
+	  </dependency>
 
       <dependency>
         <groupId>org.owasp.encoder</groupId>
-- 
cgit v1.2.3