Skip to content

Commit

Permalink
Update EditorConfig and fix trailing whitespace and end of files
Browse files Browse the repository at this point in the history
  • Loading branch information
dwalluck authored and thescouser89 committed Sep 2, 2020
1 parent d2f6eab commit 606e8a4
Show file tree
Hide file tree
Showing 18 changed files with 40 additions and 40 deletions.
11 changes: 6 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
max_line_length = off
max_line_length = 120
tab_width = 4
trim_trailing_whitespace = true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ bacon pig <phase> ...
```
## Configuration

The application is configured via the `build-config.yaml` file.
The application is configured via the `build-config.yaml` file.

A PiG `build-config.yaml` looks like this: https://github.com/project-ncl/bacon/blob/master/example-pig-config.yaml

Expand Down
2 changes: 1 addition & 1 deletion auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
</dependencies>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ public CommandResult execute(CommandInvocation commandInvocation) throws Command
log.error("Not implemented yet!");
return CommandResult.FAILURE;
}
}
}
6 changes: 3 additions & 3 deletions integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
<groupId>org.jboss.pnc.bacon</groupId>
<artifactId>common</artifactId>
</dependency>

<!-- PNC deps -->
<dependency>
<groupId>org.jboss.pnc</groupId>
<artifactId>dto</artifactId>
</dependency>

<!-- Object mapper -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -47,7 +47,7 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>

<!-- Test framework -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
* The execution is controlled by a Groovy snippet. The manager is injected to the script under 'gen'.
* </p>
* E.g. to download an artifact matching *license.zip from a build named WildFly-Swarm, one would use:
*
*
* <pre>
* gen.downloadFrom 'WildFly-Swarm' matching '.*license\\.zip'
* </pre>
* <p>
* If another method, <code>generate()</code> is added to a custom manager, it can be used as follows:
*
*
* <pre>
* gen.generate()
* </pre>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
public class Output {
private String releaseFile;
private String releaseDir;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ public String prefix() {
// noinspection StringToUpperCaseOrToLowerCaseWithoutLocale
return getName().toLowerCase().replaceAll(" ", "-");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/**
* TODO: resurrect it
*
*
* @author Michal Szynkiewicz, [email protected] <br>
* Date: 3/5/18
*/
Expand Down
2 changes: 1 addition & 1 deletion pig/src/main/resources/ARTIFACT_LIST.ftl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
${repositoryContents}
${repositoryContents}
2 changes: 1 addition & 1 deletion pig/src/main/resources/DUPLICATE_ARTIFACT_LIST.ftl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
${duplicates}
${duplicates}
2 changes: 1 addition & 1 deletion pig/src/main/resources/REPOSITORY_CONTENTS.ftl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
${repositoryContents}
${repositoryContents}
2 changes: 1 addition & 1 deletion pig/src/main/resources/REPOSITORY_COORDINATES.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<#list builds as build>
${build.name}_SCM_URL=${build.internalScmUrl}
${build.name}_SCM_REVISION=${build.scmRevision}
</#list>
</#list>
2 changes: 1 addition & 1 deletion pig/src/main/resources/license-generator.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# to run with PNC stage, you need to set the `INDY_REPO_URL` environment variable to http://indy-stage.psi.redhat.com/
repository.names=${names}
repository.urls=${urls}
${licenseServiceUrl}
${licenseServiceUrl}
2 changes: 1 addition & 1 deletion pig/src/main/resources/repository-example-settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@
<!-- Optionally, make the repository active by default -->
<activeProfile>repository</activeProfile>
</activeProfiles>
</settings>
</settings>
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ public void shouldLookupJunity456() {
assertThat(dependency.getState()).isEqualTo(DependencyState.NO_MATCH);
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ void validateProductVersionTest() {
assertThat(ProductVersionCli.validateProductVersion("42")).isFalse();
assertThat(ProductVersionCli.validateProductVersion("42.1a")).isFalse();
}
}
}
31 changes: 15 additions & 16 deletions test-common/pom.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<artifactId>parent</artifactId>
<groupId>org.jboss.pnc.bacon</groupId>
<version>2.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>parent</artifactId>
<groupId>org.jboss.pnc.bacon</groupId>
<version>2.0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>test-common</artifactId>
<artifactId>test-common</artifactId>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

</project>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

0 comments on commit 606e8a4

Please sign in to comment.