From c22e9c13d87c61c59dd76ec8ecfbfd2e63b0ae21 Mon Sep 17 00:00:00 2001
From: bvn13 <mail4bvn@gmail.com>
Date: Wed, 15 Apr 2020 01:18:46 +0300
Subject: [PATCH] update project

---
 build.gradle                                  | 36 +++++++++++--------
 bvn13.develop.covid19.main.iml                | 10 ------
 bvn13.develop.covid19.test.iml                | 12 -------
 covid19-api/build.gradle                      |  2 ++
 covid19-model/build.gradle                    |  6 ++--
 .../model/Covid19ModelApplication.java        | 18 ++++++++++
 .../covid19/model/Covid19ModelConfig.java     |  2 +-
 covid19-scheduler/build.gradle                |  2 ++
 .../StopcoronovirusRfDataRetriever.java       |  2 +-
 settings.gradle                               | 10 +++---
 10 files changed, 54 insertions(+), 46 deletions(-)
 delete mode 100644 bvn13.develop.covid19.main.iml
 delete mode 100644 bvn13.develop.covid19.test.iml
 create mode 100644 covid19-model/src/main/java/com/bvn13/covid19/model/Covid19ModelApplication.java

diff --git a/build.gradle b/build.gradle
index 1b3c629..6795713 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,26 @@
-plugins {
-    id 'org.springframework.boot' version '2.2.6.RELEASE'
-    id 'io.spring.dependency-management' version '1.0.8.RELEASE'
-    id 'java'
+buildscript {
+    ext {
+        springBootVersion = '2.2.6.RELEASE'
+        springBootDependenciesVersion = '1.0.8.RELEASE'
+    }
+
+    repositories {
+        maven { url 'https://repo.spring.io/milestone' }
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
+        classpath "io.spring.gradle:dependency-management-plugin:${springBootDependenciesVersion}"
+    }
 }
 
-//allprojects {
-//    repositories {
-//        mavenCentral()
-//        jcenter()
-//        maven { url "https://plugins.gradle.org/m2/" }
-//        maven { url 'https://repo.spring.io/milestone' }
-//    }
-//}
+allprojects {
+    repositories {
+        maven { url 'https://repo.spring.io/milestone' }
+        mavenCentral()
+    }
+}
 
 subprojects {
     project.ext {
@@ -82,6 +91,3 @@ subprojects {
 }
 
 defaultTasks('clean', 'compileTestJava', 'jar')
-
-bootJar { enabled = false }
-jar { enabled = false }
\ No newline at end of file
diff --git a/bvn13.develop.covid19.main.iml b/bvn13.develop.covid19.main.iml
deleted file mode 100644
index f6e9e70..0000000
--- a/bvn13.develop.covid19.main.iml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="covid19:main" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/build/classes/java/main" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/src/main" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/bvn13.develop.covid19.test.iml b/bvn13.develop.covid19.test.iml
deleted file mode 100644
index 523ea6a..0000000
--- a/bvn13.develop.covid19.test.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="covid19:test" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output-test url="file://$MODULE_DIR$/build/classes/java/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/src/test" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="bvn13.develop.covid19.main" />
-  </component>
-  <component name="TestModuleProperties" production-module="covid19.main" />
-</module>
\ No newline at end of file
diff --git a/covid19-api/build.gradle b/covid19-api/build.gradle
index 9cb52e2..a29fd7c 100644
--- a/covid19-api/build.gradle
+++ b/covid19-api/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'org.springframework.boot'
+
 version = '0.0.1'
 
 dependencies {
diff --git a/covid19-model/build.gradle b/covid19-model/build.gradle
index 1e0b090..a43d389 100644
--- a/covid19-model/build.gradle
+++ b/covid19-model/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'org.springframework.boot'
+
 version = '0.0.1'
 
 dependencies {
@@ -7,5 +9,5 @@ dependencies {
     testImplementation 'com.h2database:h2:1.4.194'
 }
 
-//bootJar { enabled = false }
-//jar { enabled = true }
\ No newline at end of file
+bootJar { enabled = false }
+jar { enabled = true }
\ No newline at end of file
diff --git a/covid19-model/src/main/java/com/bvn13/covid19/model/Covid19ModelApplication.java b/covid19-model/src/main/java/com/bvn13/covid19/model/Covid19ModelApplication.java
new file mode 100644
index 0000000..3c1f148
--- /dev/null
+++ b/covid19-model/src/main/java/com/bvn13/covid19/model/Covid19ModelApplication.java
@@ -0,0 +1,18 @@
+package com.bvn13.covid19.model;
+
+import com.bvn13.covid19.model.Covid19ModelConfig;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
+
+//@SpringBootApplication
+//@Import({
+//        Covid19ModelConfig.class
+//})
+public class Covid19ModelApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Covid19ModelApplication.class, args);
+    }
+
+}
diff --git a/covid19-model/src/main/java/com/bvn13/covid19/model/Covid19ModelConfig.java b/covid19-model/src/main/java/com/bvn13/covid19/model/Covid19ModelConfig.java
index fd6be57..f202943 100644
--- a/covid19-model/src/main/java/com/bvn13/covid19/model/Covid19ModelConfig.java
+++ b/covid19-model/src/main/java/com/bvn13/covid19/model/Covid19ModelConfig.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @Configuration
-//@ComponentScan("com.bvn13.covid19.model")
+@ComponentScan("com.bvn13.covid19.model")
 @EntityScan("com.bvn13.covid19.model.entities")
 public class Covid19ModelConfig {
 }
diff --git a/covid19-scheduler/build.gradle b/covid19-scheduler/build.gradle
index c621c0d..4adbef2 100644
--- a/covid19-scheduler/build.gradle
+++ b/covid19-scheduler/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'org.springframework.boot'
+
 version = '0.0.1'
 
 dependencies {
diff --git a/covid19-scheduler/src/main/java/com/bvn13/covid19/scheduler/updater/stopcoronovirusrf/StopcoronovirusRfDataRetriever.java b/covid19-scheduler/src/main/java/com/bvn13/covid19/scheduler/updater/stopcoronovirusrf/StopcoronovirusRfDataRetriever.java
index 1da4043..7b4674b 100644
--- a/covid19-scheduler/src/main/java/com/bvn13/covid19/scheduler/updater/stopcoronovirusrf/StopcoronovirusRfDataRetriever.java
+++ b/covid19-scheduler/src/main/java/com/bvn13/covid19/scheduler/updater/stopcoronovirusrf/StopcoronovirusRfDataRetriever.java
@@ -67,7 +67,7 @@ public class StopcoronovirusRfDataRetriever {
                     .build());
         }
 
-        exchange.getIn().setHeader(StopcoronovirusRfUpdater.HEADER_DATE_OF_DATA, doc.selectFirst(".d-map__title > span").ownText());
+        exchange.getIn().setHeader(StopcoronovirusRfUpdater.HEADER_DATE_OF_DATA, doc.selectFirst(".d-map__title span").ownText());
         exchange.getIn().setBody(rows);
 
     }
diff --git a/settings.gradle b/settings.gradle
index acb7f4a..33ff09d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,8 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-    }
-}
+//pluginManagement {
+//    repositories {
+//        gradlePluginPortal()
+//    }
+//}
 
 rootProject.name = 'covid19'