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 @@
-
- 4.0.0
-
- com.baeldung
- ebean
- 0.0.1-SNAPSHOT
- jar
-
- ebean
- http://maven.apache.org
-
-
- UTF-8
-
-
-
-
- io.ebean
- ebean
- 11.22.4
-
-
- com.h2database
- h2
- 1.4.196
-
-
- ch.qos.logback
- logback-classic
- 1.2.3
-
-
-
-
-
-
-
- io.ebean
- ebean-maven-plugin
- 11.11.2
-
-
-
- main
- process-classes
-
- debug=1
-
-
- enhance
-
-
-
-
-
-
-
-
diff --git a/libraries-data/ebean/src/main/resources/logback.yml b/libraries-data/ebean/src/main/resources/logback.yml
deleted file mode 100644
index c838a19c6c..0000000000
--- a/libraries-data/ebean/src/main/resources/logback.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 5b34a903ce..e1318fd597 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -1,5 +1,6 @@
-
4.0.0
libraries-data
@@ -13,6 +14,7 @@
+
com.esotericsoftware
kryo
@@ -99,36 +101,49 @@
org.datanucleus
javax.jdo
${javax.jdo.version}
+
org.datanucleus
datanucleus-core
${datanucleus.version}
+
org.datanucleus
datanucleus-api-jdo
${datanucleus.version}
+
+
org.datanucleus
datanucleus-rdbms
${datanucleus.version}
+
org.datanucleus
datanucleus-maven-plugin
${datanucleus-maven-plugin.version}
+
+
+ log4j
+ log4j
+
+
org.datanucleus
datanucleus-xml
${datanucleus-xml.version}
+
org.datanucleus
datanucleus-jdo-query
${datanucleus-jdo-query.version}
+
@@ -141,49 +156,55 @@
hazelcast
${hazelcast.version}
-
+
com.googlecode.jmapper-framework
jmapper-core
${jmapper.version}
-
-
- org.apache.crunch
- crunch-core
- ${org.apache.crunch.crunch-core.version}
-
-
- org.apache.hadoop
- hadoop-client
- ${org.apache.hadoop.hadoop-client}
- provided
-
+
+
+ org.apache.crunch
+ crunch-core
+ ${org.apache.crunch.crunch-core.version}
+
+
+ org.apache.hadoop
+ hadoop-client
+ ${org.apache.hadoop.hadoop-client}
+ provided
+
+
+ log4j
+ log4j
+
+
+
-
- commons-cli
- commons-cli
- 1.2
- provided
-
-
- commons-io
- commons-io
- 2.1
- provided
-
-
- commons-httpclient
- commons-httpclient
- 3.0.1
- provided
-
-
- commons-codec
- commons-codec
-
-
-
+
+ commons-cli
+ commons-cli
+ 1.2
+ provided
+
+
+ commons-io
+ commons-io
+ 2.1
+ provided
+
+
+ commons-httpclient
+ commons-httpclient
+ 3.0.1
+ provided
+
+
+ commons-codec
+ commons-codec
+
+
+
org.apache.flink
flink-connector-kafka-0.11_2.11
@@ -249,7 +270,32 @@
${awaitility.version}
test
+
+ io.ebean
+ ebean
+ ${ebean.version}
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+ ${slf4j.version}
+
@@ -268,16 +314,28 @@
-
-
-
+
+
+
-
-
+
+
-
+
@@ -332,54 +390,56 @@
+
+
- org.datanucleus
- datanucleus-maven-plugin
- ${datanucleus-maven-plugin.version}
+ org.apache.maven.plugins
+ maven-assembly-plugin
+ 2.3
- JDO
- ${basedir}/datanucleus.properties
- ${basedir}/log4j.properties
- true
- false
-
+
+ src/main/assembly/hadoop-job.xml
+
+
+
+ com.baeldung.crunch.WordCount
+
+
- process-classes
+ make-assembly
+ package
- enhance
+ single
-
- org.apache.maven.plugins
- maven-assembly-plugin
- 2.3
-
-
- src/main/assembly/hadoop-job.xml
-
-
-
- com.baeldung.crunch.WordCount
-
-
-
-
-
- make-assembly
- package
-
- single
-
-
-
-
-
+
+
+
+ io.ebean
+ ebean-maven-plugin
+ 11.11.2
+
+
+
+ main
+ process-classes
+
+ debug=1
+
+
+ enhance
+
+
+
+
+
+
@@ -415,7 +475,10 @@
5.0.4
1.6.0.1
0.15.0
- 2.2.0
+ 2.2.0
+ 11.22.4
+ 1.7.25
+ 1.0.1
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 99%
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
index 161bf1e820..44a4fa8562 100644
--- 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
@@ -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/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 94%
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
index 362e27c32a..dfcd90ffa7 100644
--- 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
@@ -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/ebean/src/main/java/com/baeldung/ebean/model/BaseModel.java b/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
similarity index 93%
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..547d5bf075 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/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/application.properties b/libraries-data/src/main/resources/ebean.properties
similarity index 100%
rename from libraries-data/ebean/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 @@
-
-
- %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
-
-
-
-
-
-
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file