chore: configure demo application

cosmo-webapp/pom.xml

@@ -5,48 +5,56 @@
 	<parent>
 		<artifactId>cosmo-multimodule</artifactId>
 		<groupId>net.oneandone.cosmo</groupId>
-		<version>5.0.0</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>cosmo-webapp</artifactId>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 	<name>cosmo-webapp</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>net.oneandone.cosmo</groupId>
 			<artifactId>cosmo-core</artifactId>
-			<version>5.0.3</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>         
+          <scope>provided</scope>
+        </dependency>
 
 		<!-- database drivers -->
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>ch.vorburger.mariaDB4j</groupId>
-			<artifactId>mariaDB4j-core</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>ch.vorburger.mariaDB4j</groupId>
-			<artifactId>mariaDB4j-app</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
+        <dependency>
+             <groupId>dev.atchison.mariaDB4j</groupId>
+             <artifactId>mariaDB4j</artifactId>
+             <scope>compile</scope>                            
+        </dependency>
+
+        <dependency>
+              <groupId>dev.atchison.mariaDB4j</groupId>
+              <artifactId>mariaDB4j-db-linux64</artifactId>
+              <scope>compile</scope>
+       </dependency>
+
+       <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency> 
+
+
+	  <dependency>
+	  	<groupId>org.springframework.boot</groupId>
+	  	<artifactId>spring-boot-configuration-processor</artifactId>
+	  	<optional>true</optional>
+	  </dependency>
 	</dependencies>
 
 	<build>
@@ -56,19 +64,8 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<version>${spring.boot.version}</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>3.3.2</version>
-				<configuration>
-					<configuration>
-						<failOnMissingWebXml>false</failOnMissingWebXml>
-					</configuration>
-				</configuration>
-			</plugin>
-		</plugins>
-
+			</plugin>			
+		</plugins>		
 	</build>
 
 </project>

cosmo-webapp/src/main/java/com/unitedinternet/calendar/DataSourceConfig.java

@@ -0,0 +1,39 @@
+package com.unitedinternet.calendar;
+
+import javax.sql.DataSource;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+import ch.vorburger.mariadb4j.springframework.MariaDB4jSpringService;
+
+/**
+ * Data source configuration that starts an embedded Maria DB instance before data source is created.
+ * 
+ * @author daniel grigore
+ *
+ */
+@Configuration
+@ConfigurationProperties("spring.datasource")
+public class DataSourceConfig extends HikariConfig {
+
+    @Bean(initMethod = "start", destroyMethod = "stop", name = "mariaDB")
+    public MariaDB4jSpringService mariaDBService() {
+        MariaDB4jSpringService db = new MariaDB4jSpringService();
+        db.setDefaultBaseDir("target/maridb/base");
+        db.setDefaultDataDir("target/maridb/data");
+        db.setDefaultPort(33060);
+        return db;
+    }
+
+    @Bean
+    @DependsOn("mariaDB")
+    public DataSource ds() {
+        return new HikariDataSource(this);
+    }
+}

cosmo-webapp/src/main/resources/application.yaml

@@ -46,7 +46,8 @@ external:
     size: 1048576
     non:
       proxyed:
-        hosts:  
+        hosts:
+    user-agent: COSMO      
 calendar: 
   server:
    productId: COSMO
@@ -61,7 +62,7 @@ spring:
   profiles:
     active: local
   datasource:
-    url: jdbc:mysql://localhost:33060/test?autoReconnect=true
+    jdbc-url: jdbc:mariadb://localhost:33060/test?autoReconnect=true
     username: root
     password: 
     driver-class-name: org.mariadb.jdbc.Driver