UY-1553 update to spring framework 6.2.15

ppiernik · ppiernik · commit 39f539b2a21c · 2025-12-30T09:17:01.000+01:00
diff --git a/oauth/src/main/java/pl/edu/icm/unity/oauth/as/token/introspection/RemoteIntrospectionServiceContext.java b/oauth/src/main/java/pl/edu/icm/unity/oauth/as/token/introspection/RemoteIntrospectionServiceContext.java
@@ -7,8 +7,6 @@
 
 import java.net.URL;
 
-import com.nimbusds.jose.JWSVerifier;
-
 import eu.emi.security.authn.x509.X509CertChainValidator;
 import eu.unicore.util.httpclient.ServerHostnameCheckingMode;
 
diff --git a/oauth/src/main/java/pl/edu/icm/unity/oauth/as/token/introspection/RemoteTokenIntrospectionService.java b/oauth/src/main/java/pl/edu/icm/unity/oauth/as/token/introspection/RemoteTokenIntrospectionService.java
@@ -6,21 +6,14 @@
 package pl.edu.icm.unity.oauth.as.token.introspection;
 
 import java.io.IOException;
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
-import jakarta.ws.rs.core.Response;
-
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import com.nimbusds.jose.JOSEException;
-import com.nimbusds.jose.JWSVerifier;
-import com.nimbusds.jwt.JWTClaimsSet;
-import com.nimbusds.jwt.SignedJWT;
 import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.TokenIntrospectionRequest;
 import com.nimbusds.oauth2.sdk.TokenIntrospectionResponse;
@@ -31,6 +24,7 @@
 import com.nimbusds.oauth2.sdk.id.ClientID;
 import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
 
+import jakarta.ws.rs.core.Response;
 import pl.edu.icm.unity.base.utils.Log;
 import pl.edu.icm.unity.engine.api.PKIManagement;
 import pl.edu.icm.unity.oauth.as.token.BaseOAuthResource;
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 		<jetty.version>12.1.2</jetty.version>
 		<slf4j.version>2.0.17</slf4j.version>
 		<log4j.version>2.25.2</log4j.version>
-		<spring.version>5.3.39</spring.version>
+		<spring.version>6.2.15</spring.version>
 		<vaadin.version>24.3.20</vaadin.version>
 		<cxf.version>4.1.3</cxf.version>
 		<apacheds.version>2.0.0-M26</apacheds.version>
@@ -166,6 +166,7 @@
 						<maxmem>256M</maxmem>
 						<encoding>UTF-8</encoding>
 						<compilerArgument>-Xlint:unchecked</compilerArgument>
+						<parameters>true</parameters>
 					</configuration>
 				</plugin>
 				<plugin>
diff --git a/rest/src/main/java/pl/edu/icm/unity/rest/authn/AuthenticationInterceptor.java b/rest/src/main/java/pl/edu/icm/unity/rest/authn/AuthenticationInterceptor.java
@@ -22,7 +22,6 @@
 import org.apache.cxf.phase.Phase;
 import org.apache.log4j.MDC;
 import org.apache.logging.log4j.Logger;
-import org.eclipse.jetty.http.HttpStatus;
 
 import com.google.common.collect.ImmutableSet;
 
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/attribute/DefaultAttributeDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/attribute/DefaultAttributeDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultAttributeDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public AttributeDAO getDefaultAttributeDAO(StorageConfiguration cfg, 
 			Map<String, AttributeDAO> daos)
 	{
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/attributetype/DefaultAttributeTypeDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/attributetype/DefaultAttributeTypeDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultAttributeTypeDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public AttributeTypeDAOInternal getDefaultAttributeTypeDAO(StorageConfiguration cfg, 
 			Map<String, AttributeTypeDAOInternal> atDAOs)
 	{
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/audit/DefaultAuditEventDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/audit/DefaultAuditEventDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultAuditEventDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public AuditEventDAO getDefaultAuditEventDAO(StorageConfiguration cfg,
 												 Map<String, AuditEventDAO> daos)
 	{
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/entities/DefaultEntityDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/entities/DefaultEntityDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultEntityDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public EntityDAO getDefaultEntityDAO(StorageConfiguration cfg, 
 			Map<String, EntityDAO> daos)
 	{
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/events/DefaultEventDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/events/DefaultEventDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultEventDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public EventDAO getDefaultEventDAO(StorageConfiguration cfg, 
 			Map<String, EventDAO> daos)
 	{
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/files/DefaultFileDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/files/DefaultFileDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultFileDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public FileDAO getDefaultFileDAO(StorageConfiguration cfg, 
 			Map<String, FileDAO> daos)
 	{
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/groups/DefaultGroupDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/groups/DefaultGroupDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultGroupDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public GroupDAOInternal getDefaultGroupDAO(StorageConfiguration cfg, Map<String, GroupDAOInternal> daos)
 	{
 		return daos.get(GroupDAO.DAO_ID + cfg.getEngine().name());
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/identities/DefaultIdentityDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/identities/DefaultIdentityDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultIdentityDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public IdentityDAO getDefaultIdentityDAO(StorageConfiguration cfg, Map<String, IdentityDAO> daos)
 	{
 		return daos.get(IdentityDAO.DAO_ID + cfg.getEngine().name());
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/identitytype/DefaultIdentityTypeDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/identitytype/DefaultIdentityTypeDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultIdentityTypeDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public IdentityTypeDAO getDefaultIdentityTypeDAO(StorageConfiguration cfg, 
 			Map<String, IdentityTypeDAO> daos)
 	{
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/membership/DefaultMembershipDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/membership/DefaultMembershipDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultMembershipDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public MembershipDAO getDefaultMembershipDAO(StorageConfiguration cfg, 
 			Map<String, MembershipDAO> daos)
 	{
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/messages/DefaultMessageDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/messages/DefaultMessageDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultMessageDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public MessagesDAO getDefaultMessageDAO(StorageConfiguration cfg, 
 			Map<String, MessagesDAO> daos)
 	{
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/objstore/DefaultObjectStoreDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/objstore/DefaultObjectStoreDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -22,7 +21,6 @@ public class DefaultObjectStoreDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public ObjectStoreDAO getDefaultObjectStoreDAO(StorageConfiguration cfg, 
 			Map<String, ObjectStoreDAO> daos)
 	{
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/policyDocuments/DefaultPolicyDocumentDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/policyDocuments/DefaultPolicyDocumentDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -24,7 +23,6 @@ public class DefaultPolicyDocumentDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public PolicyDocumentDAO getDefaultPolicyDocumentsDAO(StorageConfiguration cfg, Map<String, PolicyDocumentDAO> daos)
 	{
 		return daos.get(PolicyDocumentDAO.DAO_ID + cfg.getEngine().name());
diff --git a/storage/src/main/java/pl/edu/icm/unity/store/impl/tokens/DefaultTokenDAOFactory.java b/storage/src/main/java/pl/edu/icm/unity/store/impl/tokens/DefaultTokenDAOFactory.java
@@ -6,7 +6,6 @@
 
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,7 +22,6 @@ public class DefaultTokenDAOFactory
 {
 	@Bean
 	@Primary
-	@Autowired
 	public TokenDAO getDefaultTokenDAO(StorageConfiguration cfg, 
 			Map<String, TokenDAO> daos)
 	{

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`import java.util.Map;`
`8`	`8`
`9`		`-import org.springframework.beans.factory.annotation.Autowired;`
`10`	`9`	`import org.springframework.context.annotation.Bean;`
`11`	`10`	`import org.springframework.context.annotation.Configuration;`
`12`	`11`	`import org.springframework.context.annotation.Primary;`
`@@ -23,7 +22,6 @@ public class DefaultAttributeDAOFactory`
`23`	`22`	`{`
`24`	`23`	`@Bean`
`25`	`24`	`@Primary`
`26`		`- @Autowired`
`27`	`25`	`public AttributeDAO getDefaultAttributeDAO(StorageConfiguration cfg,`
`28`	`26`	`Map<String, AttributeDAO> daos)`
`29`	`27`	`{`