Skip to content

Commit

Permalink
Merge pull request #60 from NetoDevel/feature/jv-fix-maven-deps
Browse files Browse the repository at this point in the history
Feature/jv fix maven deps
  • Loading branch information
netodevel authored Jul 13, 2019
2 parents 2b9e3fb + 7f65a46 commit bf66658
Show file tree
Hide file tree
Showing 28 changed files with 96 additions and 94 deletions.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,12 @@
spring-boot-generate/target/
spring-boot-generate/*.iml
spring-scaffold-cli/target/
spring-scaffold-cli/*.iml
generator-core/target/
generator-core/*.iml
templates-java/target/
templates-java/*.iml

*.iml
.idea/

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ And install the Spring Scaffold plugin
$ git clone https://github.com/NetoDevel/cli-spring-boot-scaffold.git
$ cd cli-spring-boot-scaffold
$ mvn install
$ spring install br.com.netodevel:spring-scaffold-cli:0.0.1-SNAPSHOT
$ spring install br.com.netodevel:spring-scaffold-cli:{LATEST_RELEASE}


# Usage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package br.com.netodevel.generate.test;
package br.com.generate.test;

import br.com.generate.Layers;
import br.com.generate.source.controller.ControllerGenerator;
import br.com.netodevel.generate.utils.LoadTemplateHelper;
import br.com.generate.utils.LoadTemplateHelper;
import org.junit.Test;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package br.com.netodevel.generate.test;
package br.com.generate.test;

import br.com.generate.Layers;
import br.com.generate.source.repository.RepositoryCleanGenerator;
import br.com.netodevel.generate.utils.LoadTemplateHelper;
import br.com.generate.utils.LoadTemplateHelper;
import org.junit.Test;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package br.com.netodevel.generate.test;
package br.com.generate.test;

import br.com.generate.Layers;
import br.com.generate.source.repository.RepositoryGenerator;
import br.com.netodevel.generate.utils.LoadTemplateHelper;
import br.com.generate.utils.LoadTemplateHelper;
import org.junit.Test;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package br.com.netodevel.generate.test;
package br.com.generate.test;

import br.com.generate.Layers;
import br.com.generate.source.service.ServiceGenerator;
import br.com.netodevel.generate.utils.LoadTemplateHelper;
import br.com.generate.utils.LoadTemplateHelper;
import org.junit.Test;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.generate.utils;
package br.com.generate.utils;

import java.io.File;
import java.io.FileInputStream;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.generate.utils;
package br.com.generate.utils;

import org.apache.commons.io.IOUtils;

Expand Down
84 changes: 42 additions & 42 deletions spring-scaffold-cli/pom.xml
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
<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>br.com.netodevel</groupId>
<artifactId>spring-scaffold-cli</artifactId>
<version>0.0.2-SNAPSHOT</version>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
</parent>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-cli</artifactId>
<version>2.1.3.RELEASE</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

<dependency>
<groupId>br.com</groupId>
<artifactId>spring-boot-generate</artifactId>
<version>0.0.2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>br.com.netodevel</groupId>
<artifactId>templates-java</artifactId>
<version>0.0.1.BUILD-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>

</dependencies>
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>br.com.netodevel</groupId>
<artifactId>spring-scaffold-cli</artifactId>
<version>0.0.2-SNAPSHOT</version>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
</parent>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-cli</artifactId>
<version>2.1.3.RELEASE</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

<dependency>
<groupId>br.com</groupId>
<artifactId>spring-boot-generate</artifactId>
<version>0.0.2-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>br.com.netodevel</groupId>
<artifactId>templates-java</artifactId>
<version>0.0.2.BUILD-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>

</dependencies>

</project>
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package br.com.netodevel.command;
package br.com.command;

import br.com.command.model.ModelHandler;
import br.com.generate.helpers.ScaffoldInfoHelper;
import br.com.netodevel.command.controller.ControllerCommand;
import br.com.netodevel.command.controller.ControllerHandler;
import br.com.netodevel.command.model.ModelCommand;
import br.com.netodevel.command.model.ModelHandler;
import br.com.netodevel.command.repository.RepositoryCommand;
import br.com.netodevel.command.repository.RepositoryHandler;
import br.com.netodevel.command.scaffold.ScaffoldCommand;
import br.com.netodevel.command.scaffold.ScaffoldHandler;
import br.com.netodevel.command.service.ServiceCommand;
import br.com.netodevel.command.service.ServiceHandler;
import br.com.netodevel.command.setup.SetupScaffoldCommand;
import br.com.netodevel.command.setup.SetupScaffoldHandler;
import br.com.netodevel.command.template.TemplateCommand;
import br.com.netodevel.command.template.TemplateHandler;
import br.com.command.controller.ControllerCommand;
import br.com.command.controller.ControllerHandler;
import br.com.command.model.ModelCommand;
import br.com.command.repository.RepositoryCommand;
import br.com.command.repository.RepositoryHandler;
import br.com.command.scaffold.ScaffoldCommand;
import br.com.command.scaffold.ScaffoldHandler;
import br.com.command.service.ServiceCommand;
import br.com.command.service.ServiceHandler;
import br.com.command.setup.SetupScaffoldCommand;
import br.com.command.setup.SetupScaffoldHandler;
import br.com.command.template.TemplateCommand;
import br.com.command.template.TemplateHandler;
import org.springframework.boot.cli.command.Command;
import org.springframework.boot.cli.command.CommandFactory;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.controller;
package br.com.command.controller;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.controller;
package br.com.command.controller;

import java.io.IOException;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.model;
package br.com.command.model;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.model;
package br.com.command.model;

import java.io.IOException;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.repository;
package br.com.command.repository;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.repository;
package br.com.command.repository;

import java.io.IOException;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.scaffold;
package br.com.command.scaffold;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.scaffold;
package br.com.command.scaffold;

import java.io.IOException;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.service;
package br.com.command.service;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.service;
package br.com.command.service;

import java.io.IOException;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.setup;
package br.com.command.setup;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.setup;
package br.com.command.setup;

import java.util.Arrays;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.template;
package br.com.command.template;

import org.springframework.boot.cli.command.OptionParsingCommand;
import org.springframework.boot.cli.command.options.OptionHandler;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.template;
package br.com.command.template;

import br.com.generate.helpers.ScaffoldInfoHelper;
import br.com.generator.core.GeneratorOptions;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
br.com.netodevel.command.ScaffoldFactoryCommands
br.com.command.ScaffoldFactoryCommands
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.com.netodevel.command.template;
package br.com.command.template;

import br.com.generate.helpers.ScaffoldInfoHelper;
import org.junit.Before;
Expand Down
4 changes: 2 additions & 2 deletions templates-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<version>0.0.2.BUILD-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>templates-java</artifactId>

<build>
<plugins>
<plugin>
Expand All @@ -26,7 +26,7 @@
<dependency>
<groupId>br.com.netodevel</groupId>
<artifactId>generator-core</artifactId>
<version>0.0.1.BUILD-SNAPSHOT</version>
<version>0.0.2.BUILD-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit bf66658

Please sign in to comment.