Skip to content

Commit

Permalink
Next version with build-resources submodule holding checkstyle config
Browse files Browse the repository at this point in the history
  • Loading branch information
beamerblvd committed Oct 29, 2023
1 parent c111a1d commit c1ceb86
Show file tree
Hide file tree
Showing 3 changed files with 107 additions and 90 deletions.
47 changes: 6 additions & 41 deletions oss-build-resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@
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>

<groupId>io.oddsource.java</groupId>
<parent>
<groupId>io.oddsource.java</groupId>
<artifactId>oss-grandparent</artifactId>
<version>2.4.0-SNAPSHOT</version>
</parent>

<artifactId>oss-build-resources</artifactId>
<version>2.4.0-SNAPSHOT</version>
<packaging>jar</packaging>
Expand All @@ -30,46 +35,6 @@
Contains build tools and other resources for OddSource child projects
</description>

<licenses>
<license>
<name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo,maven,manual</distribution>
</license>
</licenses>

<url>http://oddsource.io/</url>
<scm>
<url>https://github.com/OddSource/java-oss-parent</url>
<connection>scm:git:https://github.com/OddSource/java-oss-parent.git</connection>
<developerConnection>scm:git:[email protected]:OddSource/java-oss-parent.git</developerConnection>
</scm>
<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/OddSource/java-oss-parent/issues</url>
</issueManagement>
<inceptionYear>2010</inceptionYear>

<organization>
<name>OddSource Code</name>
<url>http://oddsource.io/</url>
</organization>

<developers>
<developer>
<id>nicholas.williams</id>
<name>Nick Williams</name>
<email>[email protected]</email>
<url>http://www.nicholaswilliams.net</url>
<timezone>America/Chicago</timezone>
</developer>
</developers>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<build>
<resources>
<resource>
Expand Down
97 changes: 97 additions & 0 deletions oss-parent/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright © 2010-2023 OddSource Code ([email protected])
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<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>

<parent>
<groupId>io.oddsource.java</groupId>
<artifactId>oss-grandparent</artifactId>
<version>2.4.0-SNAPSHOT</version>
</parent>

<artifactId>oss-parent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>OddSource OSS Parent</name>
<description>
Parent POM for all OddSource Java Code projects.
</description>

<properties>
<version.plugin.checkstyle>3.3.0</version.plugin.checkstyle>
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${version.plugin.checkstyle}</version>
<inherited>true</inherited>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>9.3</version>
</dependency>
<dependency>
<groupId>io.oddsource.java</groupId>
<artifactId>oss-build-resources</artifactId>
<version>2.4.0-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
<configLocation>io/oddsource/java/checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
<failsOnError>true</failsOnError>
<includeResources>true</includeResources>
<includes>**\/*.java</includes>
<includeTestResources>true</includeTestResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<logViolationsToConsole>true</logViolationsToConsole>
<resourceIncludes>**\/*.properties</resourceIncludes>
<suppressionsLocation>io/oddsource/java/checkstyle-suppressions.xml</suppressionsLocation>
<violationSeverity>warning</violationSeverity>
</configuration>
<executions>
<execution>
<id>checkstyle-verify-style</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>
53 changes: 4 additions & 49 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@
<modelVersion>4.0.0</modelVersion>

<groupId>io.oddsource.java</groupId>
<artifactId>oss-parent</artifactId>
<artifactId>oss-grandparent</artifactId>
<version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>OddSource OSS Parent</name>
<name>OddSource OSS Grandparent</name>
<description>
Parent POM for all OddSource Java Code projects.
Grandparent POM for all OddSource Java Code projects and the build resources project.
</description>

<modules>
<module>oss-build-resources</module>
<module>oss-parent</module>
</modules>

<licenses>
Expand Down Expand Up @@ -80,7 +81,6 @@
<distribution.repo.url.sonatype.base>https://oss.sonatype.org/</distribution.repo.url.sonatype.base>
<distribution.repo.url.sonatype.snapshot>${distribution.repo.url.sonatype.base}content/repositories/snapshots</distribution.repo.url.sonatype.snapshot>
<distribution.repo.url.sonatype.staging>${distribution.repo.url.sonatype.base}service/local/staging/deploy/maven2</distribution.repo.url.sonatype.staging>
<version.plugin.checkstyle>3.3.0</version.plugin.checkstyle>
<version.plugin.checksum>1.8</version.plugin.checksum>
<version.plugin.compiler>3.11.0</version.plugin.compiler>
<version.plugin.deploy>3.1.1</version.plugin.deploy>
Expand Down Expand Up @@ -185,47 +185,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${version.plugin.checkstyle}</version>
<inherited>true</inherited>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>9.3</version>
</dependency>
<dependency>
<groupId>io.oddsource.java</groupId>
<artifactId>oss-build-resources</artifactId>
<version>2.4.0-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
<configLocation>io/oddsource/java/checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
<failsOnError>true</failsOnError>
<includeResources>true</includeResources>
<includes>**\/*.java</includes>
<includeTestResources>true</includeTestResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<logViolationsToConsole>true</logViolationsToConsole>
<resourceIncludes>**\/*.properties</resourceIncludes>
<suppressionsLocation>io/oddsource/java/checkstyle-suppressions.xml</suppressionsLocation>
<violationSeverity>warning</violationSeverity>
</configuration>
<executions>
<execution>
<id>checkstyle-verify-style</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
Expand Down Expand Up @@ -334,10 +293,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
Expand Down

0 comments on commit c1ceb86

Please sign in to comment.