Skip to content

Commit 81dd4f0

Browse files
authored
Merge pull request #10 from Gaboso/update_log
Update Log4j
2 parents e11e201 + c6b96c4 commit 81dd4f0

12 files changed

Lines changed: 104 additions & 77 deletions

File tree

CHANGELOG.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [1.3.5] - 2020-08-09
6+
7+
### Changed
8+
- Atualizada a maneira que o log é gerado.
9+
- Corrigidos erros de digitação no changelog
10+
511
## [1.3.4] - 2018-05-28
612

713
### Added
@@ -13,9 +19,9 @@ All notable changes to this project will be documented in this file.
1319
## [1.3.3] - 2018-01-20
1420

1521
### Added
16-
- Função de iniciar o jar sem passar paramêtro do workspace.
17-
- Classe FileHelper, para auxiliar ações envolvendo arquivos.
18-
- Classe OsHelper, para auxiliar ações envolvendo propreidades do SO.
22+
- Função de iniciar o jar sem passar parâmetro do workspace.
23+
- Classe FileHelper, para auxiliar as ações envolvendo arquivos.
24+
- Classe OsHelper, para auxiliar as ações envolvendo propriedades do SO.
1925

2026
### Changed
2127
- Estrutura interna de pacotes.
@@ -24,7 +30,7 @@ All notable changes to this project will be documented in this file.
2430
## [1.3.2] - 2018-01-18
2531

2632
### Changed
27-
- Correções e melhorias internas além da limpeza de codigo.
33+
- Correções e melhorias internas além da limpeza de código.
2834

2935
## [1.3.1] - 2017-12-20
3036

@@ -52,4 +58,4 @@ All notable changes to this project will be documented in this file.
5258
- Módulo de atualização do Git
5359
- Módulo de instalação do Maven
5460
- Módulo de atualização e instalação do npm
55-
- Módulo de atualização e instalação do bower
61+
- Módulo de atualização e instalação do bower

pom.xml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>br.com.gaboso</groupId>
88
<artifactId>scriptum</artifactId>
9-
<version>1.3.4</version>
9+
<version>1.3.5</version>
1010

1111
<organization>
1212
<name>com.github.gaboso</name>
@@ -32,13 +32,19 @@
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333
<maven.compiler.target>1.8</maven.compiler.target>
3434
<maven.compiler.source>1.8</maven.compiler.source>
35+
<log.version>2.6.1</log.version>
3536
</properties>
3637

3738
<dependencies>
3839
<dependency>
39-
<groupId>log4j</groupId>
40-
<artifactId>log4j</artifactId>
41-
<version>1.2.17</version>
40+
<groupId>org.apache.logging.log4j</groupId>
41+
<artifactId>log4j-api</artifactId>
42+
<version>${log.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.apache.logging.log4j</groupId>
46+
<artifactId>log4j-core</artifactId>
47+
<version>${log.version}</version>
4248
</dependency>
4349
</dependencies>
4450

@@ -74,4 +80,4 @@
7480
</plugins>
7581
</build>
7682

77-
</project>
83+
</project>

src/main/java/com/github/gaboso/Scriptum.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,15 @@
1111
import java.util.List;
1212

1313
/**
14-
* @author Gaboso
15-
* @since 19/04/2017
16-
* <p>Scriptum</p>
14+
* @since 1.0
15+
* Scriptum
1716
*/
1817
public class Scriptum {
1918

2019
public static void main(String[] args) {
21-
String workspaceDir;
22-
23-
if (args.length > 0) {
24-
workspaceDir = args[0];
25-
} else {
26-
workspaceDir = FileHelper.getJarDir();
27-
}
20+
String workspaceDir = args.length > 0
21+
? args[0]
22+
: FileHelper.getJarDir();
2823

2924
List<File> folders = FileHelper.getFoldersFromWorkspace(workspaceDir);
3025

@@ -61,4 +56,4 @@ private static void analyzeFolders(File file) {
6156
}
6257
}
6358

64-
}
59+
}

src/main/java/com/github/gaboso/helper/CommandHelper.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
package com.github.gaboso.helper;
22

3-
import org.apache.log4j.Logger;
3+
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
45

56
import java.io.BufferedReader;
67
import java.io.IOException;
78
import java.io.InputStreamReader;
89

910
/**
10-
* @author Gaboso
11-
* @since 29/04/2017
12-
* <p>
13-
* <p>CommandHelper</p>
11+
* @since 1.0
12+
* Command Helper
1413
*/
1514
public class CommandHelper {
1615

1716
private CommandHelper() {
1817
}
1918

20-
private static final Logger LOGGER = Logger.getLogger(CommandHelper.class);
19+
private static final Logger LOGGER = LogManager.getLogger(CommandHelper.class.getName());
2120

2221
public static void executeCMD(String cmd) {
2322
String runner = OsHelper.getRunner();
@@ -44,4 +43,4 @@ public static void executeCMD(String cmd) {
4443
}
4544
}
4645

47-
}
46+
}

src/main/java/com/github/gaboso/helper/FileHelper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package com.github.gaboso.helper;
22

33
import com.github.gaboso.Scriptum;
4-
import org.apache.log4j.Logger;
4+
import org.apache.logging.log4j.LogManager;
5+
import org.apache.logging.log4j.Logger;
56

67
import java.io.File;
78
import java.net.URISyntaxException;
@@ -11,7 +12,7 @@
1112

1213
public class FileHelper {
1314

14-
private static final Logger LOGGER = Logger.getLogger(FileHelper.class);
15+
private static final Logger LOGGER = LogManager.getLogger(FileHelper.class.getName());
1516

1617
private FileHelper() {
1718
}
@@ -48,4 +49,4 @@ public static List<File> getFoldersFromWorkspace(String path) {
4849
return folders;
4950
}
5051

51-
}
52+
}

src/main/java/com/github/gaboso/module/BowerModule.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.github.gaboso.format.Formatter;
44
import com.github.gaboso.helper.CommandHelper;
5-
import org.apache.log4j.Logger;
5+
import org.apache.logging.log4j.LogManager;
6+
import org.apache.logging.log4j.Logger;
67

78
import java.io.File;
89

910
/**
10-
* @author Gaboso
11-
* @since 29/04/2017
12-
* <p>BowerModule</p>
11+
* @since 1.0
12+
* Bower Module
1313
*/
1414
public class BowerModule {
1515

16-
private static final Logger LOGGER = Logger.getLogger(BowerModule.class);
16+
private static final Logger LOGGER = LogManager.getLogger(BowerModule.class.getName());
1717
private static final String NAME = "Bower";
1818

1919
private BowerModule() {
@@ -37,4 +37,4 @@ public static void executeCommands(String projectName, String projectPath) {
3737
LOGGER.info(formatter.getMessageFinishUpdate(projectName));
3838
}
3939

40-
}
40+
}

src/main/java/com/github/gaboso/module/GitModule.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
import com.github.gaboso.format.Formatter;
44
import com.github.gaboso.helper.CommandHelper;
55
import com.github.gaboso.helper.OsHelper;
6-
import org.apache.log4j.Logger;
6+
import org.apache.logging.log4j.LogManager;
7+
import org.apache.logging.log4j.Logger;
78

89
import java.io.BufferedReader;
910
import java.io.IOException;
1011
import java.io.InputStreamReader;
1112

1213
/**
13-
* @author Gaboso
14-
* @since 29/04/2017
15-
* <p>GitModule</p>
14+
* @since 1.0
15+
* Git Module
1616
*/
1717
public class GitModule {
1818

19-
private static final Logger LOGGER = Logger.getLogger(GitModule.class);
19+
private static final Logger LOGGER = LogManager.getLogger(GitModule.class.getName());
2020
private static final String NAME = "Git";
2121

2222
private GitModule() {
@@ -50,4 +50,4 @@ public static void executeCommands(String projectName, String projectPath) {
5050
LOGGER.info(formatter.getMessageFinishUpdate(projectName));
5151
}
5252

53-
}
53+
}

src/main/java/com/github/gaboso/module/GruntModule.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.github.gaboso.format.Formatter;
44
import com.github.gaboso.helper.CommandHelper;
5-
import org.apache.log4j.Logger;
5+
import org.apache.logging.log4j.LogManager;
6+
import org.apache.logging.log4j.Logger;
67

78
import java.io.File;
89

910
/**
10-
* @author Gaboso
11-
* @since 12/06/2017
12-
* <p>GruntModule</p>
11+
* @since 1.0
12+
* Grunt Module
1313
*/
1414
public class GruntModule {
1515

16-
private static final Logger LOGGER = Logger.getLogger(GruntModule.class);
16+
private static final Logger LOGGER = LogManager.getLogger(GruntModule.class.getName());
1717
private static final String NAME = "Grunt";
1818

1919
private GruntModule() {
@@ -37,4 +37,4 @@ public static void executeCommands(String projectName, String projectPath) {
3737
LOGGER.info(formatter.getMessageFinishUpdate(projectName));
3838
}
3939

40-
}
40+
}

src/main/java/com/github/gaboso/module/MavenModule.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.github.gaboso.format.Formatter;
44
import com.github.gaboso.helper.CommandHelper;
5-
import org.apache.log4j.Logger;
5+
import org.apache.logging.log4j.LogManager;
6+
import org.apache.logging.log4j.Logger;
67

78
import java.io.File;
89

910
/**
10-
* @author Gaboso
11-
* @since 29/04/2017
12-
* <p>MavenModule</p>
11+
* @since 1.0
12+
* Maven Module
1313
*/
1414
public class MavenModule {
1515

16-
private static final Logger LOGGER = Logger.getLogger(MavenModule.class);
16+
private static final Logger LOGGER = LogManager.getLogger(MavenModule.class.getName());
1717
private static final String NAME = "Maven";
1818

1919
private MavenModule() {
@@ -37,4 +37,4 @@ public static void executeCommands(String projectName, String projectPath) {
3737
LOGGER.info(formatter.getMessageFinishUpdate(projectName));
3838
}
3939

40-
}
40+
}

src/main/java/com/github/gaboso/module/NpmModule.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.github.gaboso.format.Formatter;
44
import com.github.gaboso.helper.CommandHelper;
5-
import org.apache.log4j.Logger;
5+
import org.apache.logging.log4j.LogManager;
6+
import org.apache.logging.log4j.Logger;
67

78
import java.io.File;
89

910
/**
10-
* @author Gaboso
11-
* @since 29/04/2017
12-
* <p>NpmModule</p>
11+
* @since 1.0
12+
* Npm Module
1313
*/
1414
public class NpmModule {
1515

16-
private static final Logger LOGGER = Logger.getLogger(NpmModule.class);
16+
private static final Logger LOGGER = LogManager.getLogger(NpmModule.class.getName());
1717
private static final String NAME = "NPM";
1818

1919
private NpmModule() {
@@ -37,4 +37,4 @@ public static void executeCommands(String projectName, String projectPath) {
3737
LOGGER.info(formatter.getMessageFinishUpdate(projectName));
3838
}
3939

40-
}
40+
}

0 commit comments

Comments
 (0)