Merge pull request #10 from pavankjadda/development

Development
pavankjadda · Feb 25, 2020 · 5012acd · 5012acd
2 parents 405a440 + e6bcd12
commit 5012acd
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,26 +5,27 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.1.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com</groupId>
     <artifactId>liquibasedemo</artifactId>
-    <version>0.0.1</version>
+    <version>1.0.1</version>
     <name>liquibasedemo</name>
     <description>Liquibase Demo project with Spring Boot and Spring Data</description>
 
     <properties>
-        <spring-boot.version>2.2.1.RELEASE</spring-boot.version>
-        <hibernate.version>5.4.9.Final</hibernate.version>
-        <liquibase-maven-plugin.version>3.5.5</liquibase-maven-plugin.version>
-        <liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
+        <spring-boot.version>2.2.4.RELEASE</spring-boot.version>
+        <hibernate.version>5.4.12.Final</hibernate.version>
+        <liquibase-maven-plugin.version>3.8.7</liquibase-maven-plugin.version>
+        <liquibase-hibernate5.version>3.8</liquibase-hibernate5.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <javassist.version>3.24.0-GA</javassist.version>
-        <jaxb-api.version>2.4.0-b180830.0359</jaxb-api.version>
+        <liquibase-core.version>3.8.7</liquibase-core.version>
     </properties>
 
     <dependencies>
+        <!-- Core-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -38,6 +39,7 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
+        <!-- Utilities-->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -47,12 +49,12 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
@@ -62,18 +64,20 @@
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
+            <version>${liquibase-core.version}</version>
         </dependency>
 
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <!-- Test-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -82,6 +86,7 @@
     </dependencies>
 
 
+
     <build>
         <plugins>
             <plugin>
@@ -118,6 +123,11 @@
                 </executions>
 
                 <dependencies>
+                    <dependency>
+                        <groupId>org.liquibase</groupId>
+                        <artifactId>liquibase-core</artifactId>
+                        <version>${liquibase-core.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>org.liquibase.ext</groupId>
                         <artifactId>liquibase-hibernate5</artifactId>
@@ -138,11 +148,7 @@
                         <artifactId>javassist</artifactId>
                         <version>${javassist.version}</version>
                     </dependency>
-                    <dependency>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                        <version>${jaxb-api.version}</version>
-                    </dependency>
+
                 </dependencies>
             </plugin>
         </plugins>

diff --git a/src/main/java/com/liquibasedemo/model/Country.java b/src/main/java/com/liquibasedemo/model/Country.java
@@ -14,7 +14,7 @@ public class Country
     @Id
     @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long Id;
+    private Long id;
 
     @Column(name = "name")
     private String name;
@@ -31,8 +31,4 @@ public class Country
     @JsonIgnore
     private Region region;
 
-    public Country()
-    {
-    }
-
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
@@ -4,10 +4,11 @@ spring:
     name: Liquibase Demo
   # Jpa Properties
   datasource:
-    #url: jdbc:mysql://localhost:3306/liquibasedemo
-    url: ${spring.datasource.url}
-    username: ${spring.datasource.username}
+    url: jdbc:mysql://localhost:3306/liquibasedemo
+    #url: ${spring.datasource.url}
+    username: root
     password: ${spring.datasource.password}
+
   jpa:
     hibernate:
       ddl-auto: none
@@ -22,7 +23,7 @@ spring:
 
 ## Server Properties
 server:
-  port: ${server.port}
+  port: 8080
 
 management:
   endpoints:

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -0,0 +1,36 @@
+# Application Properties
+spring:
+  application:
+    name: Liquibase Demo
+  # Jpa Properties
+  datasource:
+    url: jdbc:mysql://localhost:3306/liquibasedemo
+    #url: ${spring.datasource.url}
+    username: root
+    password: ${spring.datasource.password}
+
+  jpa:
+    hibernate:
+      ddl-auto: none
+
+  # Liquibase properties
+  devtools:
+    restart:
+      enabled: true
+  liquibase:
+    contexts: dev
+    change-log: classpath:db/db.changelog-master.xml
+
+## Server Properties
+server:
+  port: 8080
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: ["health","info"]
+  endpoint:
+    auditevents:
+      enabled: true
+
diff --git a/src/main/resources/db/db.changelog-master.xml b/src/main/resources/db/db.changelog-master.xml
@@ -1,6 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
     <includeAll path="db/changelog/" />
 </databaseChangeLog>
diff --git a/src/main/resources/liquibase.properties b/src/main/resources/liquibase.properties
@@ -1,10 +1,9 @@
-outputChangeLogFile= src/main/resources/db/db.changelog-master.xml
-driver=com.mysql.cj.jdbc.Driver
-url=jdbc:mysql://localhost:3306/liquibasedemo?serverTimezone=UTC
+
+# DB properties
+url=jdbc:mysql://localhost:3306/liquibasedemo
 username=root
 password=bcmc1234
 
-
 # Reference Properties
-referenceUrl=hibernate:spring:com.liquibasedemo.model?dialect=org.hibernate.dialect.MySQLDialect&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
-
+#referenceUrl=hibernate:spring:com.liquibasedemo.model?dialect=org.hibernate.dialect.MySQLDialect&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
+referenceUrl=hibernate:spring:com.liquibasedemo.model?dialect=org.hibernate.dialect.MySQLDialect&diffChangeLogFile=src/main/resources/db/db.changelog-master.xml