Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed version to 2.0 #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/bootique/cayenne/demo/Application.java
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/bootique/cayenne/demo/InsertDataCommand.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/io/bootique/cayenne/demo/SelectDataCommand.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {

Expand Down