Skip to content

Commit 7ada396

Browse files
committed
Merge remote-tracking branch 'linterHub/main' into release/0.1.3
# Conflicts: # .github/workflows/build.yml # README.md
2 parents 63f7c77 + 0d8f653 commit 7ada396

68 files changed

Lines changed: 778 additions & 5079 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report_template.md

Lines changed: 0 additions & 55 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/feature_request_template.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/codeql.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

.github/workflows/maven-publish.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

linter-cli/pom.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,34 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>dev.dsf.linter</groupId>
8+
<groupId>dev.dsf.utils.linter</groupId>
99
<artifactId>dsf-linter</artifactId>
1010
<version>0.1.3</version>
1111
</parent>
1212

1313
<artifactId>linter-cli</artifactId>
1414

1515
<properties>
16-
<!-- linter-cli is an executable fat-JAR, not a library – skip Central publication -->
17-
<maven.deploy.skip>true</maven.deploy.skip>
16+
<maven.compiler.source>25</maven.compiler.source>
17+
<maven.compiler.target>25</maven.compiler.target>
18+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1819
</properties>
1920

2021
<dependencies>
2122
<dependency>
22-
<groupId>dev.dsf.linter</groupId>
23+
<groupId>dev.dsf.utils.linter</groupId>
2324
<artifactId>linter-core</artifactId>
2425
<version>${project.version}</version>
2526
</dependency>
2627
<dependency>
2728
<groupId>info.picocli</groupId>
2829
<artifactId>picocli</artifactId>
29-
<version>4.7.7</version>
30+
<version>4.7.4</version>
3031
</dependency>
3132
<dependency>
3233
<groupId>com.fasterxml.jackson.core</groupId>
3334
<artifactId>jackson-annotations</artifactId>
34-
<version>2.22</version>
35+
<version>2.18.0</version>
3536
</dependency>
3637
<dependency>
3738
<groupId>org.jetbrains</groupId>
@@ -47,6 +48,7 @@
4748
<plugin>
4849
<groupId>org.apache.maven.plugins</groupId>
4950
<artifactId>maven-shade-plugin</artifactId>
51+
<version>3.4.1</version>
5052
<executions>
5153
<execution>
5254
<phase>package</phase>

linter-cli/src/main/java/dev/dsf/linter/LinterExecutor.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package dev.dsf.linter;
22

3-
import dev.dsf.linter.exclusion.ExclusionConfig;
43
import dev.dsf.linter.logger.Logger;
54

65
import java.nio.file.Path;
@@ -23,29 +22,26 @@ public class LinterExecutor {
2322
private final boolean generateHtmlReport;
2423
private final boolean generateJsonReport;
2524
private final boolean failOnErrors;
26-
private final ExclusionConfig exclusionConfig;
2725
private final Logger logger;
2826

2927
/**
3028
* Constructs a new LinterExecutor with the specified parameters.
3129
*
32-
* @param projectPath the path to the project to lint
33-
* @param reportPath the path where reports should be generated
30+
* @param projectPath the path to the project to lint
31+
* @param reportPath the path where reports should be generated
3432
* @param generateHtmlReport whether to generate an HTML report
3533
* @param generateJsonReport whether to generate a JSON report
36-
* @param failOnErrors whether to fail (exit code 1) if errors are found
37-
* @param exclusionConfig optional exclusion config; {@code null} disables exclusions
38-
* @param logger the logger for output
34+
* @param failOnErrors whether to fail (exit code 1) if errors are found
35+
* @param logger the logger for output
3936
*/
4037
public LinterExecutor(Path projectPath, Path reportPath,
4138
boolean generateHtmlReport, boolean generateJsonReport,
42-
boolean failOnErrors, ExclusionConfig exclusionConfig, Logger logger) {
39+
boolean failOnErrors, Logger logger) {
4340
this.projectPath = projectPath;
4441
this.reportPath = reportPath;
4542
this.generateHtmlReport = generateHtmlReport;
4643
this.generateJsonReport = generateJsonReport;
4744
this.failOnErrors = failOnErrors;
48-
this.exclusionConfig = exclusionConfig;
4945
this.logger = logger;
5046
}
5147

@@ -67,7 +63,6 @@ public DsfLinter.OverallLinterResult execute() throws Exception {
6763
generateHtmlReport,
6864
generateJsonReport,
6965
failOnErrors,
70-
exclusionConfig,
7166
logger
7267
);
7368

0 commit comments

Comments
 (0)