TSK-325: minor refactoring

lib/taskana-spring-txtest/pom.xml

@@ -26,10 +26,6 @@
                         <groupId>org.springframework</groupId>
                         <artifactId>spring-context</artifactId>
                 </dependency>
-                <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-jdbc</artifactId>
-                </dependency>
                 <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-jdbc</artifactId>

rest/pom.xml

@@ -33,10 +33,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>

rest/src/main/java/pro/taskana/rest/RestApplication.java

@@ -14,7 +14,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.Scope;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.http.converter.json.SpringHandlerInstantiator;
@@ -37,7 +36,6 @@ import pro.taskana.rest.resource.mapper.WorkbasketSummaryMapper;
 import pro.taskana.sampledata.SampleDataGenerator;
 
 @SpringBootApplication
-@PropertySource("classpath:datasource.properties")
 @EnableTransactionManagement
 public class RestApplication {
 
@@ -58,9 +56,6 @@ public class RestApplication {
     @Primary
     public DataSource dataSource(DataSourceProperties properties) {
         DataSource dataSource = properties.initializeDataSourceBuilder().build();
-        // if TaskanaEngineImpl runs with SpringManagedTransactionFactory, then
-        // there is no need to wrap the dataSource into TransactionAwareDataSourceProxy ...
-        // return new TransactionAwareDataSourceProxy(dataSource);
         return dataSource;
     }
 

rest/src/main/resources/application.properties

@@ -1 +1,6 @@
 logging.level.pro.taskana=DEBUG
+######## Taskana DB #######
+datasource.url=jdbc:h2:mem:taskana;IGNORECASE=TRUE
+datasource.driverClassName=org.h2.Driver
+datasource.username=sa
+datasource.password=sa

rest/src/main/resources/datasource.properties

@@ -1,5 +0,0 @@
-######## Taskana DB #######
-datasource.url=jdbc:h2:mem:taskana;IGNORECASE=TRUE
-datasource.driverClassName=org.h2.Driver
-datasource.username=sa
-datasource.password=sa