Procházet zdrojové kódy

data-upgrade update dependencies

deason před 3 měsíci
rodič
revize
3b367ed798

+ 1 - 1
api-demo/pom.xml

@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.3.7.RELEASE</version>
+                <version>${springboot.version}</version>
             </plugin>
         </plugins>
     </build>

+ 7 - 2
data-upgrade-demo/pom.xml

@@ -16,10 +16,14 @@
             <groupId>com.qmth.boot</groupId>
             <artifactId>data-upgrade</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.qmth.boot</groupId>
             <artifactId>starter-api</artifactId>
-        </dependency>
+        </dependency>-->
+        <!--<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>-->
     </dependencies>
 
     <build>
@@ -27,6 +31,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${springboot.version}</version>
             </plugin>
 
             <plugin>

+ 41 - 0
data-upgrade-demo/src/main/java/com/qmth/boot/data/upgrade/demo/config/DataSourceConfig.java

@@ -0,0 +1,41 @@
+// package com.qmth.boot.data.upgrade.demo.config;
+//
+// import com.zaxxer.hikari.HikariDataSource;
+// import org.slf4j.Logger;
+// import org.slf4j.LoggerFactory;
+// import org.springframework.beans.factory.annotation.Value;
+// import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+// import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+// import org.springframework.boot.jdbc.DatabaseDriver;
+// import org.springframework.context.annotation.Bean;
+// import org.springframework.context.annotation.Configuration;
+//
+// import javax.sql.DataSource;
+//
+// @Configuration
+// // @ImportAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
+// public class DataSourceConfig {
+//
+//     private static final Logger log = LoggerFactory.getLogger(DataSourceConfig.class);
+//
+//     @Value("${com.qmth.datasource.url}")
+//     private String dbUrl;
+//
+//     @Value("${com.qmth.datasource.username}")
+//     private String dbUsername;
+//
+//     @Value("${com.qmth.datasource.password}")
+//     private String dbPassword;
+//
+//     @Bean
+//     public DataSource dataSource() {
+//         HikariDataSource dataSource = new HikariDataSource();
+//         dataSource.setDriverClassName(DatabaseDriver.fromJdbcUrl(dbUrl).getDriverClassName());
+//         dataSource.setJdbcUrl(dbUrl);
+//         dataSource.setUsername(dbUsername);
+//         dataSource.setPassword(dbPassword);
+//         log.info("dataSource init...");
+//         return dataSource;
+//     }
+//
+// }

+ 20 - 20
data-upgrade-demo/src/main/java/com/qmth/boot/data/upgrade/demo/config/ScheduleConfig.java

@@ -1,20 +1,20 @@
-package com.qmth.boot.data.upgrade.demo.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-@Component
-@EnableScheduling
-public class ScheduleConfig {
-
-    private static final Logger log = LoggerFactory.getLogger(ScheduleConfig.class);
-
-    @Scheduled(fixedRate = 2000)
-    public void execute() {
-        log.info("job test...");
-    }
-
-}
+// package com.qmth.boot.data.upgrade.demo.config;
+//
+// import org.slf4j.Logger;
+// import org.slf4j.LoggerFactory;
+// import org.springframework.scheduling.annotation.EnableScheduling;
+// import org.springframework.scheduling.annotation.Scheduled;
+// import org.springframework.stereotype.Component;
+//
+// @Component
+// @EnableScheduling
+// public class ScheduleConfig {
+//
+//     private static final Logger log = LoggerFactory.getLogger(ScheduleConfig.class);
+//
+//     @Scheduled(fixedRate = 2000)
+//     public void execute() {
+//         log.info("job test...");
+//     }
+//
+// }

+ 7 - 1
pom.xml

@@ -18,6 +18,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <qmth.boot.version>1.0.6</qmth.boot.version>
+        <springboot.version>2.3.7.RELEASE</springboot.version>
     </properties>
 
     <dependencyManagement>
@@ -87,10 +88,15 @@
                 <artifactId>data-upgrade</artifactId>
                 <version>${qmth.boot.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-web</artifactId>
+                <version>${springboot.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-test</artifactId>
-                <version>2.3.7.RELEASE</version>
+                <version>${springboot.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>