Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: format with google java style guide #73

Merged
merged 4 commits into from
Feb 8, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
style: format with google java style guide
sitepark-veltrup committed Feb 7, 2024
commit a57cd2bafd2694d9ff8e300e4849a75299981ef7
120 changes: 0 additions & 120 deletions checkstyle.xml

This file was deleted.

143 changes: 91 additions & 52 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.sitepark.ies</groupId>
@@ -7,18 +7,18 @@
<name>IES extension api</name>
<description>API to extend the core functionality of the IES</description>

<organization>
<name>Sitepark</name>
<url>https://www.sitepark.com</url>
</organization>

<licenses>
<license>
<name>The MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>

<organization>
<name>Sitepark</name>
<url>https://www.sitepark.com</url>
</organization>

<developers>
<developer>
<id>veltrup@sitepark</id>
@@ -34,6 +34,13 @@
</developer>
</developers>

<scm>
<connection>scm:git:git@github.com:sitepark/ies-extension-api.git</connection>
<developerConnection>scm:git:git@github.com:sitepark/ies-extension-api.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/sitepark/ies-extension-api</url>
</scm>

<properties>
<junit.version>5.10.1</junit.version>
<spotbugs.version>4.8.0</spotbugs.version>
@@ -42,13 +49,6 @@
<gpg.skip>true</gpg.skip>
</properties>

<scm>
<connection>scm:git:git@github.com:sitepark/ies-extension-api.git</connection>
<developerConnection>scm:git:git@github.com:sitepark/ies-extension-api.git</developerConnection>
<url>https://github.com/sitepark/ies-extension-api</url>
<tag>HEAD</tag>
</scm>

<dependencyManagement>
<dependencies>
<dependency>
@@ -164,25 +164,32 @@
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<scmCommentPrefix>ci(release): </scmCommentPrefix>
<scmCommentPrefix>ci(release):</scmCommentPrefix>
<tagNameFormat>@{project.version}</tagNameFormat>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
<dependencies>
<dependency>
<groupId>io.github.thefolle</groupId>
<artifactId>glowing-waffle</artifactId>
<version>1.2.0</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>enforce-maven</id>
@@ -191,7 +198,7 @@
</goals>
<configuration>
<rules>
<banDuplicatePomDependencyVersions />
<banDuplicatePomDependencyVersions></banDuplicatePomDependencyVersions>
<requireMavenVersion>
<version>3.8</version>
</requireMavenVersion>
@@ -203,30 +210,22 @@
</execution>
<execution>
<id>verify-release</id>
<phase>none</phase>
<goals>
<goal>enforce</goal>
</goals>
<phase>none</phase>
<configuration>
<rules>
<requireReleaseDeps>
<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
<message>No Snapshots Allowed!</message>
</requireReleaseDeps>
<requireReleaseDepsInPlugins
implementation="org.apache.maven.enforcer.rule.requireReleaseDepsInPlugins" />
<requireReleaseDepsInPlugins implementation="org.apache.maven.enforcer.rule.requireReleaseDepsInPlugins"></requireReleaseDepsInPlugins>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>io.github.thefolle</groupId>
<artifactId>glowing-waffle</artifactId>
<version>1.2.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
@@ -260,46 +259,78 @@
</execution>
<execution>
<id>generate-code-coverage-report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.1</version>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.43.0</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<inputEncoding>UTF-8</inputEncoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
<!-- define a language-specific format -->
<java>
<removeUnusedImports>
<engine>google-java-format</engine>
</removeUnusedImports>

<!-- apply a specific flavor of google-java-format and reflow long strings -->
<googleJavaFormat>
<version>1.19.2</version>
<style>GOOGLE</style>
<reflowLongStrings>true</reflowLongStrings>
<formatJavadoc>false</formatJavadoc>
</googleJavaFormat>
<formatAnnotations></formatAnnotations>
</java>
<pom>
<!-- These are the defaults, you can override if you want -->
<includes>
<include>pom.xml</include>
</includes>
<sortPom>
<!-- value of -1 indicates that a tab character should be used instead -->
<nrOfIndentSpace>-1</nrOfIndentSpace>
</sortPom>
</pom>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>verify</phase>
<id>spotless-check</id>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.8.2.0</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<effort>Max</effort>
<threshold>Low</threshold>
@@ -315,20 +346,19 @@
<version>4.8.3</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.21.2</version>
<executions>
<execution>
<id>pmd</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.21.2</version>
<configuration>
<rulesets>
<ruleset>pmd-ruleset.xml</ruleset>
@@ -339,6 +369,15 @@
<printFailingErrors>true</printFailingErrors>
<linkXRef>false</linkXRef>
</configuration>
<executions>
<execution>
<id>pmd</id>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
Loading