Skip to content

Commit

Permalink
Format files and use editorconfig-maven-plugin to check them
Browse files Browse the repository at this point in the history
  • Loading branch information
@dwalluck @thescouser89
dwalluck authored and thescouser89 committed Sep 11, 2020
1 parent 9a33cf8 commit 3e4a806
Show file tree
Hide file tree
Showing 9 changed files with 529 additions and 509 deletions.
600 changes: 300 additions & 300 deletions eclipse-codeStyle.xml
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions integration-tests/src/test/resources/logback-test.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are assigned the type
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
<encoder>
<pattern>[%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<encoder>
<pattern>[%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="DEBUG">
<appender-ref ref="STDOUT" />
</root>
<root level="DEBUG">
<appender-ref ref="STDOUT" />
</root>

<logger name="org.eclipse" level="ERROR" />
<logger name="org.apache" level="ERROR" />
<logger name="org.eclipse" level="ERROR" />
<logger name="org.apache" level="ERROR" />
</configuration>
74 changes: 37 additions & 37 deletions pig/src/main/resources/indy-settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,41 +16,41 @@
-->
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<localRepository>${user.home}/.m2/repository</localRepository>
<profiles>
<profile>
<id>maven-central</id>
<repositories>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
</pluginRepositories>
</profile>
<profile>
<id>indy-repositories</id>
<repositories>
<repository>
<id>indy</id>
<url>${INDY_URL}</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>indy</id>
<url>${INDY_URL}</url>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>indy-repositories</activeProfile>
<activeProfile>maven-central</activeProfile>
</activeProfiles>
<localRepository>${user.home}/.m2/repository</localRepository>
<profiles>
<profile>
<id>maven-central</id>
<repositories>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
</pluginRepositories>
</profile>
<profile>
<id>indy-repositories</id>
<repositories>
<repository>
<id>indy</id>
<url>${INDY_URL}</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>indy</id>
<url>${INDY_URL}</url>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>indy-repositories</activeProfile>
<activeProfile>maven-central</activeProfile>
</activeProfiles>
</settings>
94 changes: 47 additions & 47 deletions pig/src/main/resources/indy-temp-settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,54 +16,54 @@
-->
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<localRepository>${user.home}/.m2/repository</localRepository>
<profiles>
<profile>
<id>maven-central</id>
<repositories>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
</pluginRepositories>
</profile>
<profile>
<id>indy-repositories</id>
<repositories>
<repository>
<id>indy</id>
<url>${INDY_URL}</url>
</repository>
<repository>
<id>indy-temp</id>
<url>${INDY_TMP_URL}/</url>
</repository>
<localRepository>${user.home}/.m2/repository</localRepository>
<profiles>
<profile>
<id>maven-central</id>
<repositories>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
</pluginRepositories>
</profile>
<profile>
<id>indy-repositories</id>
<repositories>
<repository>
<id>indy</id>
<url>${INDY_URL}</url>
</repository>
<repository>
<id>indy-temp</id>
<url>${INDY_TMP_URL}/</url>
</repository>
<!--${ADDITIONAL_REPOS}-->
</repositories>
<pluginRepositories>
<pluginRepository>
<id>indy</id>
<url>${INDY_URL}</url>
</pluginRepository>
<pluginRepository>
<id>indy-temp</id>
<url>${INDY_TMP_URL}</url>
</pluginRepository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>indy</id>
<url>${INDY_URL}</url>
</pluginRepository>
<pluginRepository>
<id>indy-temp</id>
<url>${INDY_TMP_URL}</url>
</pluginRepository>
<!--${ADDITIONAL_PLUGIN_REPOS}-->
</pluginRepositories>
</profile>
<profile>
</profile>
</profiles>
<activeProfiles>
<activeProfile>indy-repositories</activeProfile>
<activeProfile>maven-central</activeProfile>
</pluginRepositories>
</profile>
<profile>
</profile>
</profiles>
<activeProfiles>
<activeProfile>indy-repositories</activeProfile>
<activeProfile>maven-central</activeProfile>

</activeProfiles>
</activeProfiles>
</settings>
76 changes: 38 additions & 38 deletions pig/src/main/resources/pom-template.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,47 @@
<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>
<modelVersion>4.0.0</modelVersion>

<groupId>com.example</groupId>
<artifactId>user-project</artifactId>
<version>1.0-SNAPSHOT</version>
<groupId>com.example</groupId>
<artifactId>user-project</artifactId>
<version>1.0-SNAPSHOT</version>

<dependencyManagement>
<dependencyManagement>
<dependencies>
<dependency>
<groupId><bom-group-id/></groupId>
<artifactId><bom-artifact-id/></artifactId>
<version><bom-version/></version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId><bom-group-id/></groupId>
<artifactId><bom-artifact-id/></artifactId>
<version><bom-version/></version>
<scope>import</scope>
<type>pom</type>
</dependency>
<bom-contents/>
</dependencies>
</dependencyManagement>
<dependencies>
<bom-contents/>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.10</version>
<executions>
<execution>
<id>download-sources</id>
<phase>prepare-package</phase>
<goals>
<goal>sources</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.10</version>
<executions>
<execution>
<id>download-sources</id>
<phase>prepare-package</phase>
<goals>
<goal>sources</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
</project>
64 changes: 32 additions & 32 deletions pig/src/main/resources/repository-example-settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,38 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<profiles>
<profiles>
<!-- Configure the Maven repository -->
<profile>
<id>repository</id>
<repositories>
<repository>
<id>repository</id>
<url>file:///path/to/repo/repository/maven-repository</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repository</id>
<url>file:///path/to/repo/repository/maven-repository</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<profile>
<id>repository</id>
<repositories>
<repository>
<id>repository</id>
<url>file:///path/to/repo/repository/maven-repository</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repository</id>
<url>file:///path/to/repo/repository/maven-repository</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<!-- Optionally, make the repository active by default -->
<activeProfile>repository</activeProfile>
</activeProfiles>
<activeProfile>repository</activeProfile>
</activeProfiles>
</settings>
Loading

0 comments on commit 3e4a806

Please sign in to comment.