Make SCDF and Skipper compilable for boot 3.x

* Replaced SocketUtils with TestSocketUtils
** It was moved to the test package.
* Migrated httpclient to httpclient5
** Removed use of httpclient 4.x dependencies added yesterday
* Updated Types in AuditRecord Entity to use JdbcTypeCode
* Security Modules need to be compiled with Boot3 and securty 6
* Update SCDF to use deployer 3.0.x
* Update SCDF pom files to create Java 17 jars
* Exclude javax.annotation from deployer artifacts.
* Add jakarta annotation dependencies
* Update code from javax to jakarta
* Replaced Entity  @type with  @JavaTypeCode
* Update JobParam to batch 5.
* Update httpclient package to httpclient5 package

Author: cppwfs

pom.xml

@@ -109,8 +109,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.11.0</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>17</source>
+					<target>17</target>
 				</configuration>
 			</plugin>
 			<plugin>

spring-cloud-common-security-config/spring-cloud-common-security-config-web/src/main/java/org/springframework/cloud/common/security/IgnoreAllSecurityConfiguration.java

@@ -42,7 +42,7 @@ public void init(WebSecurity builder) {
 
 	@Override
 	public void configure(WebSecurity builder) {
-		builder.ignoring().antMatchers("/**");
+		builder.ignoring().requestMatchers("/**");
 	}
 
 }

spring-cloud-common-security-config/spring-cloud-common-security-config-web/src/main/java/org/springframework/cloud/common/security/OAuthSecurityConfiguration.java

@@ -60,8 +60,9 @@
 import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configurers.ExceptionHandlingConfigurer;
 import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
+import org.springframework.security.config.annotation.web.configurers.HttpBasicConfigurer;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProvider;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProviderBuilder;
@@ -104,8 +105,9 @@
  * @author Corneil du Plessis
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(WebSecurityConfigurerAdapter.class)
-@ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class)
+// SCDF 3.0 Migration - Need to re add this later with a different class or bean.
+// @ConditionalOnClass(WebSecurityConfigurerAdapter.class)
+// @ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class)
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.ANY)
 @EnableWebSecurity
 @Conditional(OnOAuth2SecurityEnabled.class)
@@ -122,7 +124,7 @@
 		OAuthSecurityConfiguration.ProviderManagerConfig.class,
 		OAuthSecurityConfiguration.AuthenticationProviderConfig.class
 })
-public class OAuthSecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class OAuthSecurityConfiguration {
 
 	private static final Logger logger = LoggerFactory.getLogger(OAuthSecurityConfiguration.class);
 
@@ -199,8 +201,7 @@ public void setSecurityStateBean(SecurityStateBean securityStateBean) {
 		this.securityStateBean = securityStateBean;
 	}
 
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
+	protected HttpBasicConfigurer configure(HttpSecurity http) throws Exception {
 
 		final RequestMatcher textHtmlMatcher = new MediaTypeRequestMatcher(
 				new BrowserDetectingContentNegotiationStrategy(),
@@ -238,7 +239,7 @@ protected void configure(HttpSecurity http) throws Exception {
 		security.anyRequest().denyAll();
 
 
-		http.httpBasic().and()
+		ExceptionHandlingConfigurer configurer = http.httpBasic().and()
 				.logout()
 				.logoutSuccessHandler(logoutSuccessHandler)
 				.and().csrf().disable()
@@ -268,6 +269,7 @@ else if (oAuth2ResourceServerProperties.getJwt().getJwkSetUri() != null) {
 		}
 
 		this.securityStateBean.setAuthenticationEnabled(true);
+		return http.getConfigurer(HttpBasicConfigurer.class);
 	}
 
 	protected static String dashboard(AuthorizationProperties authorizationProperties, String path) {

spring-cloud-common-security-config/spring-cloud-common-security-config-web/src/main/java/org/springframework/cloud/common/security/support/SecurityConfigUtils.java

@@ -69,7 +69,7 @@ public static ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInter
 			String attribute = matcher.group(3).trim();
 
 			logger.info("Authorization '{}' | '{}' | '{}'", method, attribute, urlPattern);
-			security = security.antMatchers(method, urlPattern).access(attribute);
+			security = security.requestMatchers(method, urlPattern).access(attribute);
 		}
 		return security;
 	}

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/AggregateTaskConfiguration.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.cloud.dataflow.aggregate.task;
 
-import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
 
 import org.slf4j.Logger;
@@ -91,8 +90,4 @@ public AggregateTaskExplorer aggregateTaskExplorer(
 				taskDeploymentReader);
 	}
 
-	@PostConstruct
-	public void setup() {
-		logger.info("created: org.springframework.cloud.dataflow.aggregate.task.AggregateTaskConfiguration");
-	}
 }

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/impl/DefaultAggregateExecutionSupport.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.cloud.dataflow.aggregate.task.impl;
 
+import java.time.ZoneId;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -148,8 +149,8 @@ public AggregateTaskExecution from(TaskExecution execution, String schemaTarget,
 					execution.getExecutionId(),
 					execution.getExitCode(),
 					execution.getTaskName(),
-					execution.getStartTime(),
-					execution.getEndTime(),
+					java.util.Date.from(execution.getStartTime().toInstant(ZoneId.systemDefault().getRules().getOffset(execution.getStartTime()))),
+					java.util.Date.from(execution.getEndTime().toInstant(ZoneId.systemDefault().getRules().getOffset(execution.getEndTime()))),
 					execution.getExitMessage(),
 					execution.getArguments(),
 					execution.getErrorMessage(),

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/impl/DefaultAggregateTaskExplorer.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.cloud.dataflow.aggregate.task.impl;
 
-import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -278,8 +277,4 @@ public AggregateTaskExecution getLatestTaskExecutionForTaskName(String taskName)
 		return aggregateExecutionSupport.from(taskExplorer.getLatestTaskExecutionForTaskName(taskName), target.getName(), getPlatformName(taskName));
 	}
 
-	@PostConstruct
-	public void setup() {
-		logger.info("created: org.springframework.cloud.dataflow.aggregate.task.impl.DefaultAggregateTaskExplorer");
-	}
 }

spring-cloud-dataflow-aggregate-task/src/main/java/org/springframework/cloud/dataflow/aggregate/task/impl/DefaultTaskRepositoryContainer.java

@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.dataflow.aggregate.task.impl;
 
-import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
 import java.util.HashMap;
 import java.util.Map;
@@ -65,8 +64,4 @@ public TaskRepository get(String schemaTarget) {
 		return repository;
 	}
 
-	@PostConstruct
-	public void setup() {
-		logger.info("created: org.springframework.cloud.dataflow.aggregate.task.impl.DefaultTaskRepositoryContainer");
-	}
 }

spring-cloud-dataflow-audit/pom.xml

@@ -45,8 +45,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.11.0</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>17</source>
+					<target>17</target>
 				</configuration>
 			</plugin>
 			<plugin>

spring-cloud-dataflow-build/pom.xml

@@ -14,7 +14,7 @@
 	</modules>
 	<url>https://spring.io/projects/spring-cloud-dataflow</url>
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 		<resource.delimiter>@</resource.delimiter>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>