update deps

Author: syjer

.travis.yml

@@ -10,7 +10,7 @@ matrix:
   include:
   - env: PROFILE="-Ddatasource.dialect=HSQLDB"
     dist: precise
-    jdk: oraclejdk8
+    jdk: openjdk8
     addons:
       apt:
         packages:
@@ -19,7 +19,7 @@ matrix:
         - mysql-client
   - env: PROFILE="-Ddatasource.dialect=PGSQL-TRAVIS -Dpgsql9.1"
     dist: precise
-    jdk: oraclejdk8
+    jdk: openjdk8
     addons:
       postgresql: '9.1'
       apt:
@@ -29,7 +29,7 @@ matrix:
         - mysql-client
   - env: PROFILE="-Ddatasource.dialect=PGSQL-TRAVIS -Dpgsql9.4"
     dist: precise
-    jdk: oraclejdk8
+    jdk: openjdk8
     addons:
       postgresql: '9.4'
       apt:
@@ -39,23 +39,23 @@ matrix:
         - mysql-client
   - env: PROFILE="-Ddatasource.dialect=MYSQL -Dmysql5.5"
     dist: precise
-    jdk: oraclejdk8
+    jdk: openjdk8
     addons:
       apt:
         packages:
         - mysql-server
         - mysql-client-core-5.5
         - mysql-client
   - env: PROFILE="-Ddatasource.dialect=MYSQL -Dmysql5.6"
-    jdk: oraclejdk8
+    jdk: openjdk8
     addons:
       apt:
         packages:
         - mysql-server-5.6
         - mysql-client-core-5.6
         - mysql-client-5.6
   - env: PROFILE="-Ddatasource.dialect=MYSQL -Dmariadb10.1"
-    jdk: oraclejdk8
+    jdk: openjdk8
     addons:
       mariadb: 10.1
 script: mvn test jacoco:report $PROFILE

pom.xml

@@ -84,12 +84,12 @@
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-mail</artifactId>
-            <version>5.1.7.RELEASE</version>
+            <version>5.2.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>ch.digitalfondue.npjt-extra</groupId>
             <artifactId>npjt-extra</artifactId>
-            <version>1.1.5</version>
+            <version>2.0.2</version>
         </dependency>
         <!-- -->
         <dependency>
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.12</version>
+            <version>1.13</version>
         </dependency>
 
         <dependency>
@@ -132,7 +132,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.2</version>
+            <version>2.8.6</version>
         </dependency>
         <!-- -->
         <dependency>
@@ -195,7 +195,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>4.0.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -233,7 +233,7 @@
         <dependency>
             <groupId>com.atlassian.commonmark</groupId>
             <artifactId>commonmark</artifactId>
-            <version>0.12.1</version>
+            <version>0.13.0</version>
         </dependency>
 
         <dependency>
@@ -245,7 +245,7 @@
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.4.1</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -255,7 +255,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.6</version>
+            <version>42.2.8</version>
         </dependency>
 
         <dependency>
@@ -342,13 +342,13 @@
 
     <!-- -->
     <properties>
-        <org.apache.logging.log4j.version>2.11.2</org.apache.logging.log4j.version>
-        <org.springframework.version>5.1.9.RELEASE</org.springframework.version>
-        <org.eclipse.jetty.version>9.4.12.v20180830</org.eclipse.jetty.version> <!-- 9.4.18.v20190429 -->
-        <com.fasterxml.jackson.version>2.10.0.pr2</com.fasterxml.jackson.version>
+        <org.apache.logging.log4j.version>2.12.1</org.apache.logging.log4j.version>
+        <org.springframework.version>5.2.1.RELEASE</org.springframework.version>
+        <org.eclipse.jetty.version>9.4.24.v20191120</org.eclipse.jetty.version> <!-- 9.4.18.v20190429 -->
+        <com.fasterxml.jackson.version>2.10.1</com.fasterxml.jackson.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sonar.sources>src/main</sonar.sources>
-        <kotlin.version>1.3.31</kotlin.version>
+        <kotlin.version>1.3.60</kotlin.version>
     </properties>
     <!-- -->
     <build>

src/main/java/io/lavagna/config/DataSourceConfig.java

@@ -36,7 +36,7 @@ public class DataSourceConfig {
 	public static final MigrationVersion LATEST_STABLE_VERSION = MigrationVersion.fromVersion("24");
 
 	@Bean
-    public LavagnaEnvironment getEnvironment(ConfigurableEnvironment environment) {
+    public LavagnaEnvironment lavagnaEnvironment(ConfigurableEnvironment environment) {
 	    return new LavagnaEnvironment(environment);
     }
 

src/main/java/io/lavagna/config/PersistenceAndServiceConfig.java

@@ -17,8 +17,7 @@
 package io.lavagna.config;
 
 
-import ch.digitalfondue.npjt.QueryFactory;
-import ch.digitalfondue.npjt.QueryRepositoryScanner;
+import ch.digitalfondue.npjt.EnableNpjt;
 import io.lavagna.common.LavagnaEnvironment;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.context.MessageSource;
@@ -47,6 +46,7 @@
  * Datasource configuration.
  */
 @EnableTransactionManagement
+@EnableNpjt(basePackages = "io.lavagna.query", activeDB = "#{lavagnaEnvironment.getRequiredProperty('datasource.dialect')}")
 @ComponentScan(basePackages = { "io.lavagna.service", "io.lavagna.config.dbmanager" })
 public class PersistenceAndServiceConfig implements SchedulingConfigurer {
 
@@ -82,16 +82,6 @@ public NamedParameterJdbcTemplate simpleJdbcTemplate(LavagnaEnvironment env, Dat
 		return new NamedParameterJdbcTemplate(jdbcTemplate);
 	}
 
-	@Bean
-	public QueryRepositoryScanner queryRepoScanner(QueryFactory queryFactory) {
-		return new QueryRepositoryScanner(queryFactory, "io.lavagna.query");
-	}
-
-	@Bean
-	public QueryFactory queryFactory(LavagnaEnvironment env, NamedParameterJdbcTemplate jdbc) {
-		return new QueryFactory(env.getProperty("datasource.dialect"), jdbc);
-	}
-
 	@Bean
 	public LobHandler lobHander() {
 		return new DefaultLobHandler();

src/test/java/io/lavagna/service/config/TestServiceConfig.java

@@ -43,7 +43,7 @@ public DatabaseMigrator migrator(LavagnaEnvironment env, DataSource dataSource)
 	}
 
 	@Bean
-	public LavagnaEnvironment env() {
+	public LavagnaEnvironment lavagnaEnvironment() {
 		MockEnvironment m = new MockEnvironment();
 		String dialect = System.getProperty("datasource.dialect", "HSQLDB");
 		for (Entry<String, String> kv : datasourceConf().get(dialect).entrySet()) {