From 7d69c44883f68e4c56fc9d033d5adcc19a7dec14 Mon Sep 17 00:00:00 2001
From: andreykravchenko <andrey.kravchenko@objectstyle.com>
Date: Tue, 17 Nov 2020 10:00:43 +0300
Subject: [PATCH] Changed version to 2.0

---
 README.md                                                 | 8 ++++----
 pom.xml                                                   | 4 ++--
 src/main/java/io/bootique/cayenne/demo/Application.java   | 6 +++---
 .../java/io/bootique/cayenne/demo/InsertDataCommand.java  | 4 ++--
 .../java/io/bootique/cayenne/demo/SelectDataCommand.java  | 5 ++---
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 70ab3ad..d7a010b 100644
--- a/README.md
+++ b/README.md
@@ -23,10 +23,10 @@ Here is how to build it:
 
 Now you can check the options available in your app:
    
-    $ java -jar target/bootique-cayenne-demo-1.0-SNAPSHOT.jar
+    $ java -jar target/bootique-cayenne-demo-2.0.jar
     
     NAME
-          bootique-cayenne-demo-1.0-SNAPSHOT.jar
+          bootique-cayenne-demo-2.0.jar
     
     OPTIONS
           -c yaml_location, --config=yaml_location
@@ -66,11 +66,11 @@ If you want to use Derby DB instead of MySQL just skip Docker step and add `--da
 
 Insert data into database via *--insert* command:
     
-    $ java  -jar target/bootique-cayenne-demo-1.0-SNAPSHOT.jar --insert --create-schema    
+    $ java -jar target/bootique-cayenne-demo-2.0.jar --insert --create-schema    
 
 Simple selection via *--select* command:
 
-    $ java  -jar target/bootique-cayenne-demo-1.0-SNAPSHOT.jar --select
+    $ java -jar target/bootique-cayenne-demo-2.0.jar --select
 
 Output:
  
diff --git a/pom.xml b/pom.xml
index 04159c2..dd4fcfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>io.bootique.cayenne.demo</groupId>
     <artifactId>bootique-cayenne-demo</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.0</version>
 
     <name>Bootique + Cayenne Demo</name>
 
@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>io.bootique.bom</groupId>
                 <artifactId>bootique-bom</artifactId>
-                <version>1.0.RC1</version>
+                <version>2.0.M1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/src/main/java/io/bootique/cayenne/demo/Application.java b/src/main/java/io/bootique/cayenne/demo/Application.java
index e31f316..4609266 100644
--- a/src/main/java/io/bootique/cayenne/demo/Application.java
+++ b/src/main/java/io/bootique/cayenne/demo/Application.java
@@ -1,14 +1,14 @@
 package io.bootique.cayenne.demo;
 
-import com.google.inject.Binder;
-import com.google.inject.Module;
 import io.bootique.BQCoreModule;
+import io.bootique.BaseModule;
 import io.bootique.Bootique;
 import io.bootique.cayenne.CayenneModule;
+import io.bootique.di.Binder;
 import io.bootique.meta.application.OptionMetadata;
 import org.apache.cayenne.configuration.server.ServerModule;
 
-public class Application implements Module {
+public class Application extends BaseModule {
 
     private static final String DATASOURCE_OPTION = "datasource";
     private static final String CREATE_SCHEMA_OPTION = "create-schema";
diff --git a/src/main/java/io/bootique/cayenne/demo/InsertDataCommand.java b/src/main/java/io/bootique/cayenne/demo/InsertDataCommand.java
index fff4006..ca04f06 100644
--- a/src/main/java/io/bootique/cayenne/demo/InsertDataCommand.java
+++ b/src/main/java/io/bootique/cayenne/demo/InsertDataCommand.java
@@ -1,7 +1,5 @@
 package io.bootique.cayenne.demo;
 
-import com.google.inject.Inject;
-import com.google.inject.Provider;
 import io.bootique.cayenne.demo.model.Article;
 import io.bootique.cayenne.demo.model.Domain;
 import io.bootique.cayenne.demo.model.Tag;
@@ -12,6 +10,8 @@
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.configuration.server.ServerRuntime;
 
+import javax.inject.Inject;
+import javax.inject.Provider;
 import java.time.LocalDateTime;
 
 public class InsertDataCommand extends CommandWithMetadata {
diff --git a/src/main/java/io/bootique/cayenne/demo/SelectDataCommand.java b/src/main/java/io/bootique/cayenne/demo/SelectDataCommand.java
index da76b4b..b2e486d 100644
--- a/src/main/java/io/bootique/cayenne/demo/SelectDataCommand.java
+++ b/src/main/java/io/bootique/cayenne/demo/SelectDataCommand.java
@@ -1,7 +1,5 @@
 package io.bootique.cayenne.demo;
 
-import com.google.inject.Inject;
-import com.google.inject.Provider;
 import io.bootique.cayenne.demo.model.Article;
 import io.bootique.cayenne.demo.model.Domain;
 import io.bootique.cli.Cli;
@@ -14,7 +12,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Provider;
 
 public class SelectDataCommand extends CommandWithMetadata {