Pin MariaDB driver to 3.0.9 (#5196)

Author: Corneil du Plessis

pom.xml

@@ -416,6 +416,14 @@
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
 					<url>https://repo.spring.io/milestone</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-libs-milestone</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/libs-milestone</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>

spring-cloud-dataflow-server-core/pom.xml

@@ -151,6 +151,8 @@
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
+			<version>3.0.9</version>
+<!--			<version>[3.0.11,)</version>-->
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>

spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/config/FlywayVendorReplacingApplicationContextInitializerTests.java

@@ -16,8 +16,15 @@
 
 package org.springframework.cloud.dataflow.server.config;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.MariaDBContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -36,13 +43,17 @@
  */
 @Testcontainers(disabledWithoutDocker = true)
 public class FlywayVendorReplacingApplicationContextInitializerTests {
-
+	private final static Logger logger = LoggerFactory.getLogger(FlywayVendorReplacingApplicationContextInitializerTests.class);
 	@Container
 	private static final MariaDBContainer<?> MARIADB_CONTAINER = new MariaDBContainer<>("mariadb:10.4")
+			.withStartupTimeout(Duration.of(1, ChronoUnit.MINUTES))
 			.withDatabaseName("dataflow")
 			.withUsername("spring")
 			.withPassword("spring");
-
+	@BeforeEach
+	public void  setup() {
+		MARIADB_CONTAINER.followOutput(new Slf4jLogConsumer(logger));
+	}
 	@Test
 	void vendorIsReplacedInFlywayLocationsWhenMysqlInUrl() {
 		String jdbcUrl = String.format("jdbc:mysql://%s:%d/dataflow?permitMysqlScheme", MARIADB_CONTAINER.getHost(), MARIADB_CONTAINER.getMappedPort(3306));

spring-cloud-dataflow-server/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
@@ -151,12 +152,14 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<configuration>
 					<detectOfflineLinks>false</detectOfflineLinks>
 				</configuration>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 				<executions>
 					<execution>

src/local/k8s/register-apps.sh

@@ -39,22 +39,20 @@ if [ "$BROKER" = "rabbitmq" ]; then
 else
     BROKER_NAME=$BROKER
 fi
-
-STREAM_APPS_VERSION=2022.0.0-SNAPSHOT
-# STREAM_APPS_VERSION=2021.1.3-SNAPSHOT
-# STREAM_APPS_VERSION=2021.1.2
-RELEASE_SNAPSHOT=snapshot
-# RELEASE_SNAPSHOT=release
-
+if [ "$STREAM_APPS_VERSION" = "" ]; then
+    export STREAM_APPS_VERSION=2022.0.0-SNAPSHOT
+    # export STREAM_APPS_VERSION=2021.1.2 # release
+fi
+echo "STREAM_APPS_VERSION=$STREAM_APPS_VERSION"
 if [ "$PLATFORM_TYPE" != "kubernetes" ]; then
     TYPE=maven
 else
     TYPE=docker
 fi
 
-if [[ "$STREAM_APPS_VERSION" == *"SNAPSHOT"* ]]; then
+if [[ "$STREAM_APPS_VERSION" = *"SNAPSHOT"* ]]; then
     STREAM_APPS_DL_VERSION=$STREAM_APPS_VERSION
-    META_DATA="https://repo.spring.io/$RELEASE_SNAPSHOT/org/springframework/cloud/stream/app/stream-applications-descriptor/${STREAM_APPS_VERSION}/maven-metadata.xml"
+    META_DATA="https://repo.spring.io/snapshot/org/springframework/cloud/stream/app/stream-applications-descriptor/${STREAM_APPS_VERSION}/maven-metadata.xml"
     echo "Downloading $META_DATA"
     curl -o maven-metadata.xml -s $META_DATA
     DL_TS=$(xmllint --xpath "/metadata/versioning/snapshot/timestamp/text()" maven-metadata.xml | sed 's/\.//')