From 2a7a33f71748db1ac7161de1f1bc650ca8fe9440 Mon Sep 17 00:00:00 2001
From: josephine-barboza <josephine.barboza@gmail.com>
Date: Fri, 28 Sep 2018 06:15:03 +0530
Subject: [PATCH 01/13] BAEL-2169

---
 libraries-data/ebean/pom.xml | 59 ++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 libraries-data/ebean/pom.xml

diff --git a/libraries-data/ebean/pom.xml b/libraries-data/ebean/pom.xml
new file mode 100644
index 0000000000..2e319e1523
--- /dev/null
+++ b/libraries-data/ebean/pom.xml
@@ -0,0 +1,59 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.baeldung</groupId>
+    <artifactId>ebean</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>ebean</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.ebean</groupId>
+            <artifactId>ebean</artifactId>
+            <version>11.22.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.196</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <!-- Need to fix this pluginManagement -->
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>io.ebean</groupId>
+                    <artifactId>ebean-maven-plugin</artifactId>
+                    <version>11.11.2</version>
+                    <executions>
+                        <!-- enhance main classes -->
+                        <execution>
+                            <id>main</id>
+                            <phase>process-classes</phase>
+                            <configuration>
+                                <transformArgs>debug=1</transformArgs>
+                            </configuration>
+                            <goals>
+                                <goal>enhance</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>

From 18f4728a9f4cc73a5f615ea2ec12c3229add6da3 Mon Sep 17 00:00:00 2001
From: josephine-barboza <josephine.barboza@gmail.com>
Date: Fri, 28 Sep 2018 06:17:40 +0530
Subject: [PATCH 02/13] Create Address.java

---
 .../com/baeldung/ebean/model/Address.java     | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Address.java

diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Address.java b/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Address.java
new file mode 100644
index 0000000000..362e27c32a
--- /dev/null
+++ b/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Address.java
@@ -0,0 +1,42 @@
+package com.baeldung.ebean.model;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Address extends BaseModel{
+
+    public Address(String addressLine1, String addressLine2, String city) {
+        super();
+        this.addressLine1 = addressLine1;
+        this.addressLine2 = addressLine2;
+        this.city = city;
+    }
+    
+    private String addressLine1;
+    private String addressLine2;
+    private String city;
+    
+    public String getAddressLine1() {
+        return addressLine1;
+    }
+    public void setAddressLine1(String addressLine1) {
+        this.addressLine1 = addressLine1;
+    }
+    public String getAddressLine2() {
+        return addressLine2;
+    }
+    public void setAddressLine2(String addressLine2) {
+        this.addressLine2 = addressLine2;
+    }
+    public String getCity() {
+        return city;
+    }
+    public void setCity(String city) {
+        this.city = city;
+    }
+    @Override
+    public String toString() {
+        return "Address [id=" + id + ", addressLine1=" + addressLine1 + ", addressLine2=" + addressLine2 + ", city=" + city + "]";
+    }
+    
+}

From a9d3d8ea07a81f2b8e7e753a2bb9fbe5ceb790a9 Mon Sep 17 00:00:00 2001
From: josephine-barboza <josephine.barboza@gmail.com>
Date: Fri, 28 Sep 2018 06:18:48 +0530
Subject: [PATCH 03/13] Add files via upload

---
 .../com/baeldung/ebean/model/BaseModel.java   | 59 +++++++++++++++++++
 .../com/baeldung/ebean/model/Customer.java    | 42 +++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 libraries-data/ebean/src/main/java/com/baeldung/ebean/model/BaseModel.java
 create mode 100644 libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Customer.java

diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/BaseModel.java b/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/BaseModel.java
new file mode 100644
index 0000000000..7634df7aa0
--- /dev/null
+++ b/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/BaseModel.java
@@ -0,0 +1,59 @@
+package com.baeldung.ebean.model;
+
+import java.time.Instant;
+
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+
+import io.ebean.annotation.WhenCreated;
+import io.ebean.annotation.WhenModified;
+
+@MappedSuperclass
+public abstract class BaseModel {
+
+    @Id
+    protected long id;
+    
+    @Version
+    protected long version;
+    
+    @WhenCreated
+    protected Instant createdOn;
+    
+    @WhenModified
+    protected Instant modifiedOn;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public Instant getCreatedOn() {
+        return createdOn;
+    }
+
+    public void setCreatedOn(Instant createdOn) {
+        this.createdOn = createdOn;
+    }
+
+    public Instant getModifiedOn() {
+        return modifiedOn;
+    }
+
+    public void setModifiedOn(Instant modifiedOn) {
+        this.modifiedOn = modifiedOn;
+    }
+
+    public long getVersion() {
+        return version;
+    }
+
+    public void setVersion(long version) {
+        this.version = version;
+    }
+    
+}
diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Customer.java b/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Customer.java
new file mode 100644
index 0000000000..df1db82de4
--- /dev/null
+++ b/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Customer.java
@@ -0,0 +1,42 @@
+package com.baeldung.ebean.model;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+
+@Entity
+public class Customer extends BaseModel {
+
+    public Customer(String name, Address address) {
+        super();
+        this.name = name;
+        this.address = address;
+    }
+
+    private String name;
+
+    @OneToOne(cascade = CascadeType.ALL)
+    Address address;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(Address address) {
+        this.address = address;
+    }
+
+    @Override
+    public String toString() {
+        return "Customer [id=" + id + ", name=" + name + ", address=" + address + "]";
+    }
+
+}

From 9510ca6fa1f066ad4328bfde92d4d8240d641ac5 Mon Sep 17 00:00:00 2001
From: josephine-barboza <josephine.barboza@gmail.com>
Date: Fri, 28 Sep 2018 06:19:55 +0530
Subject: [PATCH 04/13] Create App.java

---
 .../main/java/com/baeldung/ebean/app/App.java | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App.java

diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App.java b/libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App.java
new file mode 100644
index 0000000000..161bf1e820
--- /dev/null
+++ b/libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App.java
@@ -0,0 +1,75 @@
+package com.baeldung.ebean.app;
+
+import java.util.Arrays;
+
+import com.baeldung.ebean.model.Address;
+import com.baeldung.ebean.model.Customer;
+
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.annotation.Transactional;
+
+public class App {
+
+    public static void main(String[] args) {
+        insertAndDeleteInsideTransaction();
+        crudOperations();
+        queryCustomers();
+    }
+
+    @Transactional
+    public static void insertAndDeleteInsideTransaction() {
+
+        Customer c1 = getCustomer();
+        EbeanServer server = Ebean.getDefaultServer();
+        server.save(c1);
+        Customer foundC1 = server.find(Customer.class, c1.getId());
+        server.delete(foundC1);
+    }
+
+    public static void crudOperations() {
+
+        Address a1 = new Address("5, Wide Street", null, "New York");
+        Customer c1 = new Customer("John Wide", a1);
+
+        EbeanServer server = Ebean.getDefaultServer();
+        server.save(c1);
+
+        c1.setName("Jane Wide");
+        c1.setAddress(null);
+        server.save(c1);
+
+        Customer foundC1 = Ebean.find(Customer.class, c1.getId());
+
+        Ebean.delete(foundC1);
+    }
+
+    public static void queryCustomers() {
+        Address a1 = new Address("1, Big Street", null, "New York");
+        Customer c1 = new Customer("Big John", a1);
+
+        Address a2 = new Address("2, Big Street", null, "New York");
+        Customer c2 = new Customer("Big John", a2);
+
+        Address a3 = new Address("3, Big Street", null, "San Jose");
+        Customer c3 = new Customer("Big Bob", a3);
+
+        Ebean.saveAll(Arrays.asList(c1, c2, c3));
+
+        Customer customer = Ebean.find(Customer.class)
+            .select("name")
+            .fetch("address", "city")
+            .where()
+            .eq("city", "San Jose")
+            .findOne();
+
+        Ebean.deleteAll(Arrays.asList(c1, c2, c3));
+    }
+
+    private static Customer getCustomer() {
+        Address a1 = new Address("1, Big Street", null, "New York");
+        Customer c1 = new Customer("Big John", a1);
+        return c1;
+    }
+
+}

From 8b8e3f2650c36840e7a57517dccdd6740a5c7800 Mon Sep 17 00:00:00 2001
From: josephine-barboza <josephine.barboza@gmail.com>
Date: Fri, 28 Sep 2018 06:20:22 +0530
Subject: [PATCH 05/13] Create App2.java

---
 .../java/com/baeldung/ebean/app/App2.java     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App2.java

diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App2.java b/libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App2.java
new file mode 100644
index 0000000000..fba77007c6
--- /dev/null
+++ b/libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App2.java
@@ -0,0 +1,26 @@
+package com.baeldung.ebean.app;
+
+import java.util.Properties;
+
+import io.ebean.EbeanServer;
+import io.ebean.EbeanServerFactory;
+import io.ebean.config.ServerConfig;
+
+public class App2 {
+
+    public static void main(String[] args) {
+        ServerConfig cfg = new ServerConfig();
+        cfg.setDefaultServer(true);
+        Properties properties = new Properties();
+        properties.put("ebean.db.ddl.generate", "true");
+        properties.put("ebean.db.ddl.run", "true");
+        properties.put("datasource.db.username", "sa");
+        properties.put("datasource.db.password", "");
+        properties.put("datasource.db.databaseUrl", "jdbc:h2:mem:app2");
+        properties.put("datasource.db.databaseDriver", "org.h2.Driver");
+        cfg.loadFromProperties(properties);
+        EbeanServer server = EbeanServerFactory.create(cfg);
+
+    }
+
+}

From 9fcc873f6378cabf35970d31157f918be87c73be Mon Sep 17 00:00:00 2001
From: josephine-barboza <josephine.barboza@gmail.com>
Date: Fri, 28 Sep 2018 06:20:58 +0530
Subject: [PATCH 06/13] Create application.properties

---
 .../ebean/src/main/resources/application.properties        | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 libraries-data/ebean/src/main/resources/application.properties

diff --git a/libraries-data/ebean/src/main/resources/application.properties b/libraries-data/ebean/src/main/resources/application.properties
new file mode 100644
index 0000000000..9cc5cc170a
--- /dev/null
+++ b/libraries-data/ebean/src/main/resources/application.properties
@@ -0,0 +1,7 @@
+ebean.db.ddl.generate=true
+ebean.db.ddl.run=true
+
+datasource.db.username=sa
+datasource.db.password=
+datasource.db.databaseUrl=jdbc:h2:mem:customer
+datasource.db.databaseDriver=org.h2.Driver

From a22470ac23ebf9a50c5d5aed6e708e3f23078e19 Mon Sep 17 00:00:00 2001
From: josephine-barboza <josephine.barboza@gmail.com>
Date: Fri, 28 Sep 2018 06:21:19 +0530
Subject: [PATCH 07/13] Create ebean.mf

---
 libraries-data/ebean/src/main/resources/ebean.mf | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 libraries-data/ebean/src/main/resources/ebean.mf

diff --git a/libraries-data/ebean/src/main/resources/ebean.mf b/libraries-data/ebean/src/main/resources/ebean.mf
new file mode 100644
index 0000000000..f49fecc717
--- /dev/null
+++ b/libraries-data/ebean/src/main/resources/ebean.mf
@@ -0,0 +1,3 @@
+entity-packages: com.baeldung.ebean.model
+transactional-packages: com.baeldung.ebean.app
+querybean-packages: com.baeldung.ebean.app

From 772179794686e62ebd6ffba2c3b067a6659c9185 Mon Sep 17 00:00:00 2001
From: josephine-barboza <josephine.barboza@gmail.com>
Date: Fri, 28 Sep 2018 06:21:38 +0530
Subject: [PATCH 08/13] Create logback.yml

---
 libraries-data/ebean/src/main/resources/logback.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 libraries-data/ebean/src/main/resources/logback.yml

diff --git a/libraries-data/ebean/src/main/resources/logback.yml b/libraries-data/ebean/src/main/resources/logback.yml
new file mode 100644
index 0000000000..c838a19c6c
--- /dev/null
+++ b/libraries-data/ebean/src/main/resources/logback.yml
@@ -0,0 +1,3 @@
+<logger name="io.ebean.DDL" level="TRACE"/>
+<logger name="io.ebean.SQL" level="TRACE"/>
+<logger name="io.ebean.TXN" level="TRACE"/>

From 5022d3fbf95a82d085d992c3b0a3b2f0a9bee486 Mon Sep 17 00:00:00 2001
From: Josephine Barboza <dhananjay.shaw@nviz.com>
Date: Sat, 6 Oct 2018 01:32:25 +0530
Subject: [PATCH 09/13] Ebean Chnages

---
 libraries-data/ebean/pom.xml                  |  59 ---------
 libraries-data/pom.xml                        |  56 +++++----
 .../main/java/com/baeldung/ebean/app/App.java |   0
 .../java/com/baeldung/ebean/app/App2.java     |   0
 .../com/baeldung/ebean/model/Address.java     |   0
 .../com/baeldung/ebean/model/BaseModel.java   | 118 +++++++++---------
 .../com/baeldung/ebean/model/Customer.java    |  84 ++++++-------
 .../src/main/resources/application.properties |   0
 .../{ebean => }/src/main/resources/ebean.mf   |   0
 .../src/main/resources/logback.yml            |   0
 10 files changed, 136 insertions(+), 181 deletions(-)
 delete mode 100644 libraries-data/ebean/pom.xml
 rename libraries-data/{ebean => }/src/main/java/com/baeldung/ebean/app/App.java (100%)
 rename libraries-data/{ebean => }/src/main/java/com/baeldung/ebean/app/App2.java (100%)
 rename libraries-data/{ebean => }/src/main/java/com/baeldung/ebean/model/Address.java (100%)
 rename libraries-data/{ebean => }/src/main/java/com/baeldung/ebean/model/BaseModel.java (94%)
 rename libraries-data/{ebean => }/src/main/java/com/baeldung/ebean/model/Customer.java (95%)
 rename libraries-data/{ebean => }/src/main/resources/application.properties (100%)
 rename libraries-data/{ebean => }/src/main/resources/ebean.mf (100%)
 rename libraries-data/{ebean => }/src/main/resources/logback.yml (100%)

diff --git a/libraries-data/ebean/pom.xml b/libraries-data/ebean/pom.xml
deleted file mode 100644
index 2e319e1523..0000000000
--- a/libraries-data/ebean/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung</groupId>
-    <artifactId>ebean</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>ebean</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.ebean</groupId>
-            <artifactId>ebean</artifactId>
-            <version>11.22.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.196</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <!-- Need to fix this pluginManagement -->
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>io.ebean</groupId>
-                    <artifactId>ebean-maven-plugin</artifactId>
-                    <version>11.11.2</version>
-                    <executions>
-                        <!-- enhance main classes -->
-                        <execution>
-                            <id>main</id>
-                            <phase>process-classes</phase>
-                            <configuration>
-                                <transformArgs>debug=1</transformArgs>
-                            </configuration>
-                            <goals>
-                                <goal>enhance</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 5b34a903ce..abbbe9c5de 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -249,6 +249,18 @@
             <version>${awaitility.version}</version>
             <scope>test</scope>
         </dependency>
+		
+		<dependency>
+            <groupId>io.ebean</groupId>
+            <artifactId>ebean</artifactId>
+            <version>11.22.4</version>
+        </dependency>
+       
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+        </dependency>
 
     </dependencies>
 
@@ -332,27 +344,7 @@
             <!-- /Reladomo -->
 
             <!-- JDO Plugin -->
-            <plugin>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>datanucleus-maven-plugin</artifactId>
-                <version>${datanucleus-maven-plugin.version}</version>
-                <configuration>
-                    <api>JDO</api>
-                    <props>${basedir}/datanucleus.properties</props>
-                    <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                    <verbose>true</verbose>
-                    <fork>false</fork>
-                    <!-- Solve windows line too long error -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>enhance</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+           
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -380,6 +372,28 @@
 			</plugin>
 
         </plugins>
+		<pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>io.ebean</groupId>
+                    <artifactId>ebean-maven-plugin</artifactId>
+                    <version>11.11.2</version>
+                    <executions>
+                        <!-- enhance main classes -->
+                        <execution>
+                            <id>main</id>
+                            <phase>process-classes</phase>
+                            <configuration>
+                                <transformArgs>debug=1</transformArgs>
+                            </configuration>
+                            <goals>
+                                <goal>enhance</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <repositories>
diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App.java b/libraries-data/src/main/java/com/baeldung/ebean/app/App.java
similarity index 100%
rename from libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App.java
rename to libraries-data/src/main/java/com/baeldung/ebean/app/App.java
diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App2.java b/libraries-data/src/main/java/com/baeldung/ebean/app/App2.java
similarity index 100%
rename from libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App2.java
rename to libraries-data/src/main/java/com/baeldung/ebean/app/App2.java
diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Address.java b/libraries-data/src/main/java/com/baeldung/ebean/model/Address.java
similarity index 100%
rename from libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Address.java
rename to libraries-data/src/main/java/com/baeldung/ebean/model/Address.java
diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/BaseModel.java b/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
similarity index 94%
rename from libraries-data/ebean/src/main/java/com/baeldung/ebean/model/BaseModel.java
rename to libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
index 7634df7aa0..1390507605 100644
--- a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/BaseModel.java
+++ b/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
@@ -1,59 +1,59 @@
-package com.baeldung.ebean.model;
-
-import java.time.Instant;
-
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Version;
-
-import io.ebean.annotation.WhenCreated;
-import io.ebean.annotation.WhenModified;
-
-@MappedSuperclass
-public abstract class BaseModel {
-
-    @Id
-    protected long id;
-    
-    @Version
-    protected long version;
-    
-    @WhenCreated
-    protected Instant createdOn;
-    
-    @WhenModified
-    protected Instant modifiedOn;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Instant getCreatedOn() {
-        return createdOn;
-    }
-
-    public void setCreatedOn(Instant createdOn) {
-        this.createdOn = createdOn;
-    }
-
-    public Instant getModifiedOn() {
-        return modifiedOn;
-    }
-
-    public void setModifiedOn(Instant modifiedOn) {
-        this.modifiedOn = modifiedOn;
-    }
-
-    public long getVersion() {
-        return version;
-    }
-
-    public void setVersion(long version) {
-        this.version = version;
-    }
-    
-}
+package com.baeldung.ebean.model;
+
+import java.time.Instant;
+
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+
+import io.ebean.annotation.WhenCreated;
+import io.ebean.annotation.WhenModified;
+
+@MappedSuperclass
+public abstract class BaseModel {
+
+    @Id
+    protected long id;
+    
+    @Version
+    protected long version;
+    
+    @WhenCreated
+    protected Instant createdOn;
+    
+    @WhenModified
+    protected Instant modifiedOn;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public Instant getCreatedOn() {
+        return createdOn;
+    }
+
+    public void setCreatedOn(Instant createdOn) {
+        this.createdOn = createdOn;
+    }
+
+    public Instant getModifiedOn() {
+        return modifiedOn;
+    }
+
+    public void setModifiedOn(Instant modifiedOn) {
+        this.modifiedOn = modifiedOn;
+    }
+
+    public long getVersion() {
+        return version;
+    }
+
+    public void setVersion(long version) {
+        this.version = version;
+    }
+    
+}
diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Customer.java b/libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java
similarity index 95%
rename from libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Customer.java
rename to libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java
index df1db82de4..4dd629245a 100644
--- a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Customer.java
+++ b/libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java
@@ -1,42 +1,42 @@
-package com.baeldung.ebean.model;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
-
-@Entity
-public class Customer extends BaseModel {
-
-    public Customer(String name, Address address) {
-        super();
-        this.name = name;
-        this.address = address;
-    }
-
-    private String name;
-
-    @OneToOne(cascade = CascadeType.ALL)
-    Address address;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Address getAddress() {
-        return address;
-    }
-
-    public void setAddress(Address address) {
-        this.address = address;
-    }
-
-    @Override
-    public String toString() {
-        return "Customer [id=" + id + ", name=" + name + ", address=" + address + "]";
-    }
-
-}
+package com.baeldung.ebean.model;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+
+@Entity
+public class Customer extends BaseModel {
+
+    public Customer(String name, Address address) {
+        super();
+        this.name = name;
+        this.address = address;
+    }
+
+    private String name;
+
+    @OneToOne(cascade = CascadeType.ALL)
+    Address address;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(Address address) {
+        this.address = address;
+    }
+
+    @Override
+    public String toString() {
+        return "Customer [id=" + id + ", name=" + name + ", address=" + address + "]";
+    }
+
+}
diff --git a/libraries-data/ebean/src/main/resources/application.properties b/libraries-data/src/main/resources/application.properties
similarity index 100%
rename from libraries-data/ebean/src/main/resources/application.properties
rename to libraries-data/src/main/resources/application.properties
diff --git a/libraries-data/ebean/src/main/resources/ebean.mf b/libraries-data/src/main/resources/ebean.mf
similarity index 100%
rename from libraries-data/ebean/src/main/resources/ebean.mf
rename to libraries-data/src/main/resources/ebean.mf
diff --git a/libraries-data/ebean/src/main/resources/logback.yml b/libraries-data/src/main/resources/logback.yml
similarity index 100%
rename from libraries-data/ebean/src/main/resources/logback.yml
rename to libraries-data/src/main/resources/logback.yml

From 62d677ed30e1337e6829a547f59a571889fc94db Mon Sep 17 00:00:00 2001
From: Josephine Barboza <dhananjay.shaw@nviz.com>
Date: Sun, 7 Oct 2018 13:14:31 +0530
Subject: [PATCH 10/13] BAEL-2169 Guide to Ebean

---
 libraries-data/pom.xml                        | 207 +++++++++++-------
 .../main/java/com/baeldung/ebean/app/App.java |   2 +-
 .../com/baeldung/ebean/model/Address.java     |  14 +-
 .../com/baeldung/ebean/model/BaseModel.java   |   8 +-
 ...pplication.properties => ebean.properties} |   0
 libraries-data/src/main/resources/logback.xml |  29 ++-
 libraries-data/src/main/resources/logback.yml |   3 -
 7 files changed, 162 insertions(+), 101 deletions(-)
 rename libraries-data/src/main/resources/{application.properties => ebean.properties} (100%)
 delete mode 100644 libraries-data/src/main/resources/logback.yml

diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index abbbe9c5de..e1318fd597 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>libraries-data</artifactId>
@@ -13,6 +14,7 @@
     </parent>
 
     <dependencies>
+
         <dependency>
             <groupId>com.esotericsoftware</groupId>
             <artifactId>kryo</artifactId>
@@ -99,36 +101,49 @@
             <groupId>org.datanucleus</groupId>
             <artifactId>javax.jdo</artifactId>
             <version>${javax.jdo.version}</version>
+
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
             <version>${datanucleus.version}</version>
+
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-api-jdo</artifactId>
             <version>${datanucleus.version}</version>
+
+
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-rdbms</artifactId>
             <version>${datanucleus.version}</version>
+
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-maven-plugin</artifactId>
             <version>${datanucleus-maven-plugin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-xml</artifactId>
             <version>${datanucleus-xml.version}</version>
+
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-jdo-query</artifactId>
             <version>${datanucleus-jdo-query.version}</version>
+
         </dependency>
         <!-- Jcache -->
         <dependency>
@@ -141,49 +156,55 @@
             <artifactId>hazelcast</artifactId>
             <version>${hazelcast.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>com.googlecode.jmapper-framework</groupId>
             <artifactId>jmapper-core</artifactId>
             <version>${jmapper.version}</version>
         </dependency>
-        <!--  crunch project  -->
-		<dependency>
-			<groupId>org.apache.crunch</groupId>
-			<artifactId>crunch-core</artifactId>
-			<version>${org.apache.crunch.crunch-core.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>hadoop-client</artifactId>
-			<version>${org.apache.hadoop.hadoop-client}</version>
-			<scope>provided</scope>
-		</dependency>
+        <!-- crunch project -->
+        <dependency>
+            <groupId>org.apache.crunch</groupId>
+            <artifactId>crunch-core</artifactId>
+            <version>${org.apache.crunch.crunch-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-client</artifactId>
+            <version>${org.apache.hadoop.hadoop-client}</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-			<version>1.2</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>3.0.1</version>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-codec</groupId>
-					<artifactId>commons-codec</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-kafka-0.11_2.11</artifactId>
@@ -249,19 +270,32 @@
             <version>${awaitility.version}</version>
             <scope>test</scope>
         </dependency>
-		
-		<dependency>
+        <dependency>
             <groupId>io.ebean</groupId>
             <artifactId>ebean</artifactId>
-            <version>11.22.4</version>
+            <version>${ebean.version}</version>
         </dependency>
-       
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -280,16 +314,28 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
-                                <taskdef name="gen-reladomo" classpath="plugin_classpath" classname="com.gs.fw.common.mithra.generator.MithraGenerator" />
-                                <gen-reladomo xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml" generateGscListMethod="true"
-                                    generatedDir="${project.build.directory}/generated-sources/reladomo" nonGeneratedDir="${project.basedir}/src/main/java" />
+                                <property
+                                    name="plugin_classpath"
+                                    refid="maven.plugin.classpath" />
+                                <taskdef name="gen-reladomo"
+                                    classpath="plugin_classpath"
+                                    classname="com.gs.fw.common.mithra.generator.MithraGenerator" />
+                                <gen-reladomo
+                                    xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
+                                    generateGscListMethod="true"
+                                    generatedDir="${project.build.directory}/generated-sources/reladomo"
+                                    nonGeneratedDir="${project.basedir}/src/main/java" />
 
-                                <taskdef name="gen-ddl" classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator" loaderRef="reladomoGenerator">
-                                    <classpath refid="maven.plugin.classpath" />
+                                <taskdef name="gen-ddl"
+                                    classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator"
+                                    loaderRef="reladomoGenerator">
+                                    <classpath
+                                        refid="maven.plugin.classpath" />
                                 </taskdef>
-                                <gen-ddl xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
-                                    generatedDir="${project.build.directory}/generated-db/sql" databaseType="postgres" />
+                                <gen-ddl
+                                    xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
+                                    generatedDir="${project.build.directory}/generated-db/sql"
+                                    databaseType="postgres" />
                             </tasks>
                         </configuration>
                     </execution>
@@ -344,35 +390,35 @@
             <!-- /Reladomo -->
 
             <!-- JDO Plugin -->
-           
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/hadoop-job.xml</descriptor>
-					</descriptors>
-					<archive>
-						<manifest>
-							<mainClass>com.baeldung.crunch.WordCount</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/hadoop-job.xml</descriptor>
+                    </descriptors>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.baeldung.crunch.WordCount</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
         </plugins>
-		<pluginManagement>
+        <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>io.ebean</groupId>
@@ -429,7 +475,10 @@
         <datanucleus-jdo-query.version>5.0.4</datanucleus-jdo-query.version>
         <jmapper.version>1.6.0.1</jmapper.version>
         <org.apache.crunch.crunch-core.version>0.15.0</org.apache.crunch.crunch-core.version>
-        <org.apache.hadoop.hadoop-client>2.2.0</org.apache.hadoop.hadoop-client>   
+        <org.apache.hadoop.hadoop-client>2.2.0</org.apache.hadoop.hadoop-client>
+        <ebean.version>11.22.4</ebean.version>
+        <slf4j.version>1.7.25</slf4j.version>
+        <logback.version>1.0.1</logback.version>
     </properties>
 
 </project>
diff --git a/libraries-data/src/main/java/com/baeldung/ebean/app/App.java b/libraries-data/src/main/java/com/baeldung/ebean/app/App.java
index 161bf1e820..44a4fa8562 100644
--- a/libraries-data/src/main/java/com/baeldung/ebean/app/App.java
+++ b/libraries-data/src/main/java/com/baeldung/ebean/app/App.java
@@ -28,7 +28,7 @@ public class App {
     }
 
     public static void crudOperations() {
-
+    	
         Address a1 = new Address("5, Wide Street", null, "New York");
         Customer c1 = new Customer("John Wide", a1);
 
diff --git a/libraries-data/src/main/java/com/baeldung/ebean/model/Address.java b/libraries-data/src/main/java/com/baeldung/ebean/model/Address.java
index 362e27c32a..dfcd90ffa7 100644
--- a/libraries-data/src/main/java/com/baeldung/ebean/model/Address.java
+++ b/libraries-data/src/main/java/com/baeldung/ebean/model/Address.java
@@ -3,7 +3,7 @@ package com.baeldung.ebean.model;
 import javax.persistence.Entity;
 
 @Entity
-public class Address extends BaseModel{
+public class Address extends BaseModel {
 
     public Address(String addressLine1, String addressLine2, String city) {
         super();
@@ -11,32 +11,38 @@ public class Address extends BaseModel{
         this.addressLine2 = addressLine2;
         this.city = city;
     }
-    
+
     private String addressLine1;
     private String addressLine2;
     private String city;
-    
+
     public String getAddressLine1() {
         return addressLine1;
     }
+
     public void setAddressLine1(String addressLine1) {
         this.addressLine1 = addressLine1;
     }
+
     public String getAddressLine2() {
         return addressLine2;
     }
+
     public void setAddressLine2(String addressLine2) {
         this.addressLine2 = addressLine2;
     }
+
     public String getCity() {
         return city;
     }
+
     public void setCity(String city) {
         this.city = city;
     }
+
     @Override
     public String toString() {
         return "Address [id=" + id + ", addressLine1=" + addressLine1 + ", addressLine2=" + addressLine2 + ", city=" + city + "]";
     }
-    
+
 }
diff --git a/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java b/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
index 1390507605..547d5bf075 100644
--- a/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
+++ b/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
@@ -14,13 +14,13 @@ public abstract class BaseModel {
 
     @Id
     protected long id;
-    
+
     @Version
     protected long version;
-    
+
     @WhenCreated
     protected Instant createdOn;
-    
+
     @WhenModified
     protected Instant modifiedOn;
 
@@ -55,5 +55,5 @@ public abstract class BaseModel {
     public void setVersion(long version) {
         this.version = version;
     }
-    
+
 }
diff --git a/libraries-data/src/main/resources/application.properties b/libraries-data/src/main/resources/ebean.properties
similarity index 100%
rename from libraries-data/src/main/resources/application.properties
rename to libraries-data/src/main/resources/ebean.properties
diff --git a/libraries-data/src/main/resources/logback.xml b/libraries-data/src/main/resources/logback.xml
index 7d900d8ea8..21f797ed71 100644
--- a/libraries-data/src/main/resources/logback.xml
+++ b/libraries-data/src/main/resources/logback.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
+	<appender name="STDOUT"
+		class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+			</pattern>
+		</encoder>
+	</appender>
+	<logger name="io.ebean.DDL" level="TRACE">
+		<appender-ref ref="STDOUT" />
+	</logger>
+	<logger name="io.ebean.SQL" level="TRACE">
+		<appender-ref ref="STDOUT" />
+	</logger>
+	<logger name="io.ebean.TXN" level="TRACE">
+		<appender-ref ref="STDOUT" />
+	</logger>
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
 </configuration>
\ No newline at end of file
diff --git a/libraries-data/src/main/resources/logback.yml b/libraries-data/src/main/resources/logback.yml
deleted file mode 100644
index c838a19c6c..0000000000
--- a/libraries-data/src/main/resources/logback.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-<logger name="io.ebean.DDL" level="TRACE"/>
-<logger name="io.ebean.SQL" level="TRACE"/>
-<logger name="io.ebean.TXN" level="TRACE"/>

From f916c468cdc15e9c9e08aff4700fc5406a2a2133 Mon Sep 17 00:00:00 2001
From: Josephine Barboza <JosephineB@citiustech.com>
Date: Wed, 10 Oct 2018 16:51:44 +0530
Subject: [PATCH 11/13] BAEL-2169 Guide to Ebean

---
 libraries-data/pom.xml                        |  5 -----
 libraries-data/src/main/resources/logback.xml | 12 +++---------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index e1318fd597..4b9701fe68 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -416,10 +416,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-        </plugins>
-        <pluginManagement>
-            <plugins>
                 <plugin>
                     <groupId>io.ebean</groupId>
                     <artifactId>ebean-maven-plugin</artifactId>
@@ -439,7 +435,6 @@
                     </executions>
                 </plugin>
             </plugins>
-        </pluginManagement>
     </build>
 
     <repositories>
diff --git a/libraries-data/src/main/resources/logback.xml b/libraries-data/src/main/resources/logback.xml
index 21f797ed71..9cce5fb855 100644
--- a/libraries-data/src/main/resources/logback.xml
+++ b/libraries-data/src/main/resources/logback.xml
@@ -7,15 +7,9 @@
 			</pattern>
 		</encoder>
 	</appender>
-	<logger name="io.ebean.DDL" level="TRACE">
-		<appender-ref ref="STDOUT" />
-	</logger>
-	<logger name="io.ebean.SQL" level="TRACE">
-		<appender-ref ref="STDOUT" />
-	</logger>
-	<logger name="io.ebean.TXN" level="TRACE">
-		<appender-ref ref="STDOUT" />
-	</logger>
+	<logger name="io.ebean.DDL" level="TRACE"/>
+	<logger name="io.ebean.SQL" level="TRACE"/>
+	<logger name="io.ebean.TXN" level="TRACE"/>
 	<root level="INFO">
 		<appender-ref ref="STDOUT" />
 	</root>

From e83b7670548f576c54fc27328b47e53175a4b645 Mon Sep 17 00:00:00 2001
From: Josephine Barboza <JosephineB@citiustech.com>
Date: Wed, 10 Oct 2018 19:12:51 +0530
Subject: [PATCH 12/13] Updated formatting

---
 libraries-data/pom.xml                        | 119 ++++++++----------
 libraries-data/src/main/resources/logback.xml |  25 ++--
 2 files changed, 65 insertions(+), 79 deletions(-)

diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 4b9701fe68..6584ca6b23 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>libraries-data</artifactId>
@@ -14,7 +13,6 @@
     </parent>
 
     <dependencies>
-
         <dependency>
             <groupId>com.esotericsoftware</groupId>
             <artifactId>kryo</artifactId>
@@ -101,49 +99,36 @@
             <groupId>org.datanucleus</groupId>
             <artifactId>javax.jdo</artifactId>
             <version>${javax.jdo.version}</version>
-
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
             <version>${datanucleus.version}</version>
-
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-api-jdo</artifactId>
             <version>${datanucleus.version}</version>
-
-
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-rdbms</artifactId>
             <version>${datanucleus.version}</version>
-
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-maven-plugin</artifactId>
             <version>${datanucleus-maven-plugin.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-xml</artifactId>
             <version>${datanucleus-xml.version}</version>
-
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-jdo-query</artifactId>
             <version>${datanucleus-jdo-query.version}</version>
-
         </dependency>
         <!-- Jcache -->
         <dependency>
@@ -156,13 +141,13 @@
             <artifactId>hazelcast</artifactId>
             <version>${hazelcast.version}</version>
         </dependency>
-
+        
         <dependency>
             <groupId>com.googlecode.jmapper-framework</groupId>
             <artifactId>jmapper-core</artifactId>
             <version>${jmapper.version}</version>
         </dependency>
-        <!-- crunch project -->
+        <!--  crunch project  -->
         <dependency>
             <groupId>org.apache.crunch</groupId>
             <artifactId>crunch-core</artifactId>
@@ -173,12 +158,6 @@
             <artifactId>hadoop-client</artifactId>
             <version>${org.apache.hadoop.hadoop-client}</version>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -314,28 +293,16 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <property
-                                    name="plugin_classpath"
-                                    refid="maven.plugin.classpath" />
-                                <taskdef name="gen-reladomo"
-                                    classpath="plugin_classpath"
-                                    classname="com.gs.fw.common.mithra.generator.MithraGenerator" />
-                                <gen-reladomo
-                                    xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
-                                    generateGscListMethod="true"
-                                    generatedDir="${project.build.directory}/generated-sources/reladomo"
-                                    nonGeneratedDir="${project.basedir}/src/main/java" />
+                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
+                                <taskdef name="gen-reladomo" classpath="plugin_classpath" classname="com.gs.fw.common.mithra.generator.MithraGenerator" />
+                                <gen-reladomo xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml" generateGscListMethod="true"
+                                    generatedDir="${project.build.directory}/generated-sources/reladomo" nonGeneratedDir="${project.basedir}/src/main/java" />
 
-                                <taskdef name="gen-ddl"
-                                    classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator"
-                                    loaderRef="reladomoGenerator">
-                                    <classpath
-                                        refid="maven.plugin.classpath" />
+                                <taskdef name="gen-ddl" classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator" loaderRef="reladomoGenerator">
+                                    <classpath refid="maven.plugin.classpath" />
                                 </taskdef>
-                                <gen-ddl
-                                    xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
-                                    generatedDir="${project.build.directory}/generated-db/sql"
-                                    databaseType="postgres" />
+                                <gen-ddl xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml"
+                                    generatedDir="${project.build.directory}/generated-db/sql" databaseType="postgres" />
                             </tasks>
                         </configuration>
                     </execution>
@@ -390,7 +357,27 @@
             <!-- /Reladomo -->
 
             <!-- JDO Plugin -->
-
+            <plugin>
+                <groupId>org.datanucleus</groupId>
+                <artifactId>datanucleus-maven-plugin</artifactId>
+                <version>${datanucleus-maven-plugin.version}</version>
+                <configuration>
+                    <api>JDO</api>
+                    <props>${basedir}/datanucleus.properties</props>
+                    <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+                    <verbose>true</verbose>
+                    <fork>false</fork>
+                    <!-- Solve windows line too long error -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>enhance</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -416,25 +403,25 @@
                     </execution>
                 </executions>
             </plugin>
-                <plugin>
-                    <groupId>io.ebean</groupId>
-                    <artifactId>ebean-maven-plugin</artifactId>
-                    <version>11.11.2</version>
-                    <executions>
-                        <!-- enhance main classes -->
-                        <execution>
-                            <id>main</id>
-                            <phase>process-classes</phase>
-                            <configuration>
-                                <transformArgs>debug=1</transformArgs>
-                            </configuration>
-                            <goals>
-                                <goal>enhance</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
+            <plugin>
+                <groupId>io.ebean</groupId>
+                <artifactId>ebean-maven-plugin</artifactId>
+                <version>11.11.2</version>
+                <executions>
+                    <!-- enhance main classes -->
+                    <execution>
+                        <id>main</id>
+                        <phase>process-classes</phase>
+                        <configuration>
+                            <transformArgs>debug=1</transformArgs>
+                        </configuration>
+                        <goals>
+                            <goal>enhance</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
     <repositories>
@@ -473,7 +460,7 @@
         <org.apache.hadoop.hadoop-client>2.2.0</org.apache.hadoop.hadoop-client>
         <ebean.version>11.22.4</ebean.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <logback.version>1.0.1</logback.version>
+        <logback.version>1.0.1</logback.version>        
     </properties>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/libraries-data/src/main/resources/logback.xml b/libraries-data/src/main/resources/logback.xml
index 9cce5fb855..a57d22fcb2 100644
--- a/libraries-data/src/main/resources/logback.xml
+++ b/libraries-data/src/main/resources/logback.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<appender name="STDOUT"
-		class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-			</pattern>
-		</encoder>
-	</appender>
-	<logger name="io.ebean.DDL" level="TRACE"/>
-	<logger name="io.ebean.SQL" level="TRACE"/>
-	<logger name="io.ebean.TXN" level="TRACE"/>
-	<root level="INFO">
-		<appender-ref ref="STDOUT" />
-	</root>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+    <logger name="io.ebean.DDL" level="TRACE"/>
+    <logger name="io.ebean.SQL" level="TRACE"/>
+    <logger name="io.ebean.TXN" level="TRACE"/>
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
 </configuration>
\ No newline at end of file

From af818fddbf2793ae9dcfe8e324ded960e90b4786 Mon Sep 17 00:00:00 2001
From: Josephine Barboza <JosephineB@citiustech.com>
Date: Wed, 10 Oct 2018 21:27:08 +0530
Subject: [PATCH 13/13] Upadated pom.xml

---
 libraries-data/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 6584ca6b23..bbf0c7832f 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -457,10 +457,10 @@
         <datanucleus-jdo-query.version>5.0.4</datanucleus-jdo-query.version>
         <jmapper.version>1.6.0.1</jmapper.version>
         <org.apache.crunch.crunch-core.version>0.15.0</org.apache.crunch.crunch-core.version>
-        <org.apache.hadoop.hadoop-client>2.2.0</org.apache.hadoop.hadoop-client>
+        <org.apache.hadoop.hadoop-client>2.2.0</org.apache.hadoop.hadoop-client> 
         <ebean.version>11.22.4</ebean.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <logback.version>1.0.1</logback.version>        
+        <logback.version>1.0.1</logback.version>          
     </properties>
 
-</project>
\ No newline at end of file
+</project>