Skip to content

Commit bf66658

Browse files
netodevelnetodevel
authored
Merge pull request #60 from NetoDevel/feature/jv-fix-maven-deps
Feature/jv fix maven deps
2 parents 2b9e3fb + 7f65a46 commit bf66658

28 files changed

+96
-94
lines changed

‎.gitignore

+10
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
11
spring-boot-generate/target/
2+
spring-boot-generate/*.iml
23
spring-scaffold-cli/target/
4+
spring-scaffold-cli/*.iml
5+
generator-core/target/
6+
generator-core/*.iml
7+
templates-java/target/
8+
templates-java/*.iml
9+
10+
*.iml
11+
.idea/
12+

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ And install the Spring Scaffold plugin
4444
$ git clone https://github.com/NetoDevel/cli-spring-boot-scaffold.git
4545
$ cd cli-spring-boot-scaffold
4646
$ mvn install
47-
$ spring install br.com.netodevel:spring-scaffold-cli:0.0.1-SNAPSHOT
47+
$ spring install br.com.netodevel:spring-scaffold-cli:{LATEST_RELEASE}
4848

4949

5050
# Usage

‎spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ControllerGenerateTest.java ‎spring-boot-generate/src/test/java/br/com/generate/test/ControllerGenerateTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package br.com.netodevel.generate.test;
1+
package br.com.generate.test;
22

33
import br.com.generate.Layers;
44
import br.com.generate.source.controller.ControllerGenerator;
5-
import br.com.netodevel.generate.utils.LoadTemplateHelper;
5+
import br.com.generate.utils.LoadTemplateHelper;
66
import org.junit.Test;
77

88
import java.io.IOException;

‎spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryCleanGeneratorBoundaryTest.java ‎spring-boot-generate/src/test/java/br/com/generate/test/RepositoryCleanGeneratorBoundaryTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package br.com.netodevel.generate.test;
1+
package br.com.generate.test;
22

33
import br.com.generate.Layers;
44
import br.com.generate.source.repository.RepositoryCleanGenerator;
5-
import br.com.netodevel.generate.utils.LoadTemplateHelper;
5+
import br.com.generate.utils.LoadTemplateHelper;
66
import org.junit.Test;
77

88
import java.io.IOException;

‎spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryGenerateTest.java ‎spring-boot-generate/src/test/java/br/com/generate/test/RepositoryGenerateTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package br.com.netodevel.generate.test;
1+
package br.com.generate.test;
22

33
import br.com.generate.Layers;
44
import br.com.generate.source.repository.RepositoryGenerator;
5-
import br.com.netodevel.generate.utils.LoadTemplateHelper;
5+
import br.com.generate.utils.LoadTemplateHelper;
66
import org.junit.Test;
77

88
import java.io.IOException;

‎spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ServiceGenerateTest.java ‎spring-boot-generate/src/test/java/br/com/generate/test/ServiceGenerateTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package br.com.netodevel.generate.test;
1+
package br.com.generate.test;
22

33
import br.com.generate.Layers;
44
import br.com.generate.source.service.ServiceGenerator;
5-
import br.com.netodevel.generate.utils.LoadTemplateHelper;
5+
import br.com.generate.utils.LoadTemplateHelper;
66
import org.junit.Test;
77

88
import java.io.IOException;

‎spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/FileGeneratorTestUtils.java ‎spring-boot-generate/src/test/java/br/com/generate/utils/FileGeneratorTestUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.generate.utils;
1+
package br.com.generate.utils;
22

33
import java.io.File;
44
import java.io.FileInputStream;

‎spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/LoadTemplateHelper.java ‎spring-boot-generate/src/test/java/br/com/generate/utils/LoadTemplateHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.generate.utils;
1+
package br.com.generate.utils;
22

33
import org.apache.commons.io.IOUtils;
44

‎spring-scaffold-cli/pom.xml

+42-42
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>br.com.netodevel</groupId>
5-
<artifactId>spring-scaffold-cli</artifactId>
6-
<version>0.0.2-SNAPSHOT</version>
7-
8-
<parent>
9-
<groupId>org.springframework.boot</groupId>
10-
<artifactId>spring-boot-starter-parent</artifactId>
11-
<version>2.1.3.RELEASE</version>
12-
</parent>
13-
14-
<dependencies>
15-
<dependency>
16-
<groupId>org.springframework.boot</groupId>
17-
<artifactId>spring-boot-cli</artifactId>
18-
<version>2.1.3.RELEASE</version>
19-
</dependency>
20-
21-
<dependency>
22-
<groupId>junit</groupId>
23-
<artifactId>junit</artifactId>
24-
</dependency>
25-
26-
<dependency>
27-
<groupId>br.com</groupId>
28-
<artifactId>spring-boot-generate</artifactId>
29-
<version>0.0.2-SNAPSHOT</version>
30-
</dependency>
31-
32-
<dependency>
33-
<groupId>br.com.netodevel</groupId>
34-
<artifactId>templates-java</artifactId>
35-
<version>0.0.1.BUILD-SNAPSHOT</version>
36-
</dependency>
37-
38-
<dependency>
39-
<groupId>org.springframework.boot</groupId>
40-
<artifactId>spring-boot-starter-test</artifactId>
41-
</dependency>
42-
43-
</dependencies>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>br.com.netodevel</groupId>
5+
<artifactId>spring-scaffold-cli</artifactId>
6+
<version>0.0.2-SNAPSHOT</version>
7+
8+
<parent>
9+
<groupId>org.springframework.boot</groupId>
10+
<artifactId>spring-boot-starter-parent</artifactId>
11+
<version>2.1.3.RELEASE</version>
12+
</parent>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.springframework.boot</groupId>
17+
<artifactId>spring-boot-cli</artifactId>
18+
<version>2.1.3.RELEASE</version>
19+
</dependency>
20+
21+
<dependency>
22+
<groupId>junit</groupId>
23+
<artifactId>junit</artifactId>
24+
</dependency>
25+
26+
<dependency>
27+
<groupId>br.com</groupId>
28+
<artifactId>spring-boot-generate</artifactId>
29+
<version>0.0.2-SNAPSHOT</version>
30+
</dependency>
31+
32+
<dependency>
33+
<groupId>br.com.netodevel</groupId>
34+
<artifactId>templates-java</artifactId>
35+
<version>0.0.2.BUILD-SNAPSHOT</version>
36+
</dependency>
37+
38+
<dependency>
39+
<groupId>org.springframework.boot</groupId>
40+
<artifactId>spring-boot-starter-test</artifactId>
41+
</dependency>
42+
43+
</dependencies>
4444

4545
</project>

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/ScaffoldFactoryCommands.java ‎spring-scaffold-cli/src/main/java/br/com/command/ScaffoldFactoryCommands.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
package br.com.netodevel.command;
1+
package br.com.command;
22

3+
import br.com.command.model.ModelHandler;
34
import br.com.generate.helpers.ScaffoldInfoHelper;
4-
import br.com.netodevel.command.controller.ControllerCommand;
5-
import br.com.netodevel.command.controller.ControllerHandler;
6-
import br.com.netodevel.command.model.ModelCommand;
7-
import br.com.netodevel.command.model.ModelHandler;
8-
import br.com.netodevel.command.repository.RepositoryCommand;
9-
import br.com.netodevel.command.repository.RepositoryHandler;
10-
import br.com.netodevel.command.scaffold.ScaffoldCommand;
11-
import br.com.netodevel.command.scaffold.ScaffoldHandler;
12-
import br.com.netodevel.command.service.ServiceCommand;
13-
import br.com.netodevel.command.service.ServiceHandler;
14-
import br.com.netodevel.command.setup.SetupScaffoldCommand;
15-
import br.com.netodevel.command.setup.SetupScaffoldHandler;
16-
import br.com.netodevel.command.template.TemplateCommand;
17-
import br.com.netodevel.command.template.TemplateHandler;
5+
import br.com.command.controller.ControllerCommand;
6+
import br.com.command.controller.ControllerHandler;
7+
import br.com.command.model.ModelCommand;
8+
import br.com.command.repository.RepositoryCommand;
9+
import br.com.command.repository.RepositoryHandler;
10+
import br.com.command.scaffold.ScaffoldCommand;
11+
import br.com.command.scaffold.ScaffoldHandler;
12+
import br.com.command.service.ServiceCommand;
13+
import br.com.command.service.ServiceHandler;
14+
import br.com.command.setup.SetupScaffoldCommand;
15+
import br.com.command.setup.SetupScaffoldHandler;
16+
import br.com.command.template.TemplateCommand;
17+
import br.com.command.template.TemplateHandler;
1818
import org.springframework.boot.cli.command.Command;
1919
import org.springframework.boot.cli.command.CommandFactory;
2020

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/controller/ControllerCommand.java ‎spring-scaffold-cli/src/main/java/br/com/command/controller/ControllerCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.controller;
1+
package br.com.command.controller;
22

33
import java.util.ArrayList;
44
import java.util.Collection;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/controller/ControllerHandler.java ‎spring-scaffold-cli/src/main/java/br/com/command/controller/ControllerHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.controller;
1+
package br.com.command.controller;
22

33
import java.io.IOException;
44
import java.util.Arrays;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/model/ModelCommand.java ‎spring-scaffold-cli/src/main/java/br/com/command/model/ModelCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.model;
1+
package br.com.command.model;
22

33
import java.util.ArrayList;
44
import java.util.Collection;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/model/ModelHandler.java ‎spring-scaffold-cli/src/main/java/br/com/command/model/ModelHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.model;
1+
package br.com.command.model;
22

33
import java.io.IOException;
44
import java.util.Arrays;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/repository/RepositoryCommand.java ‎spring-scaffold-cli/src/main/java/br/com/command/repository/RepositoryCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.repository;
1+
package br.com.command.repository;
22

33
import java.util.ArrayList;
44
import java.util.Collection;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/repository/RepositoryHandler.java ‎spring-scaffold-cli/src/main/java/br/com/command/repository/RepositoryHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.repository;
1+
package br.com.command.repository;
22

33
import java.io.IOException;
44
import java.util.Arrays;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/scaffold/ScaffoldCommand.java ‎spring-scaffold-cli/src/main/java/br/com/command/scaffold/ScaffoldCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.scaffold;
1+
package br.com.command.scaffold;
22

33
import java.util.ArrayList;
44
import java.util.Collection;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/scaffold/ScaffoldHandler.java ‎spring-scaffold-cli/src/main/java/br/com/command/scaffold/ScaffoldHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.scaffold;
1+
package br.com.command.scaffold;
22

33
import java.io.IOException;
44
import java.util.Arrays;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/service/ServiceCommand.java ‎spring-scaffold-cli/src/main/java/br/com/command/service/ServiceCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.service;
1+
package br.com.command.service;
22

33
import java.util.ArrayList;
44
import java.util.Collection;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/service/ServiceHandler.java ‎spring-scaffold-cli/src/main/java/br/com/command/service/ServiceHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.service;
1+
package br.com.command.service;
22

33
import java.io.IOException;
44
import java.util.Arrays;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/setup/SetupScaffoldCommand.java ‎spring-scaffold-cli/src/main/java/br/com/command/setup/SetupScaffoldCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.setup;
1+
package br.com.command.setup;
22

33
import java.util.ArrayList;
44
import java.util.Collection;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/setup/SetupScaffoldHandler.java ‎spring-scaffold-cli/src/main/java/br/com/command/setup/SetupScaffoldHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.setup;
1+
package br.com.command.setup;
22

33
import java.util.Arrays;
44

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/template/TemplateCommand.java ‎spring-scaffold-cli/src/main/java/br/com/command/template/TemplateCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.template;
1+
package br.com.command.template;
22

33
import org.springframework.boot.cli.command.OptionParsingCommand;
44
import org.springframework.boot.cli.command.options.OptionHandler;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/command/template/TemplateHandler.java ‎spring-scaffold-cli/src/main/java/br/com/command/template/TemplateHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.template;
1+
package br.com.command.template;
22

33
import br.com.generate.helpers.ScaffoldInfoHelper;
44
import br.com.generator.core.GeneratorOptions;

‎spring-scaffold-cli/src/main/java/br/com/netodevel/exceptions/ValidatorException.java

-8
This file was deleted.

‎spring-scaffold-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
br.com.netodevel.command.ScaffoldFactoryCommands
1+
br.com.command.ScaffoldFactoryCommands

‎spring-scaffold-cli/src/test/java/br/com/netodevel/command/template/TemplateHandlerTest.java ‎spring-scaffold-cli/src/test/java/br/com/command/template/TemplateHandlerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package br.com.netodevel.command.template;
1+
package br.com.command.template;
22

33
import br.com.generate.helpers.ScaffoldInfoHelper;
44
import org.junit.Before;

‎templates-java/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<version>0.0.2.BUILD-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
11-
1211
<artifactId>templates-java</artifactId>
12+
1313
<build>
1414
<plugins>
1515
<plugin>
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>br.com.netodevel</groupId>
2828
<artifactId>generator-core</artifactId>
29-
<version>0.0.1.BUILD-SNAPSHOT</version>
29+
<version>0.0.2.BUILD-SNAPSHOT</version>
3030
<scope>compile</scope>
3131
</dependency>
3232
</dependencies>

0 commit comments

Comments
 (0)