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

Add formatting for pom.xml via Spotless and Eclipse WTP #54

Merged
merged 1 commit into from
Jan 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
161 changes: 80 additions & 81 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,44 +1,52 @@
<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/maven-v4_0_0.xsd">
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.mfoo</groupId>
<artifactId>libyear-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>0.0.1</version>

<name>libyear-maven-plugin Maven Mojo</name>
<description>This plugin helps you see how outdated your Maven project dependencies are via the libyear dependency freshness measure.</description>
<description>This plugin helps you see how outdated your Maven project
dependencies are via the libyear dependency freshness measure.</description>
<url>https://github.com/mfoo/libyear-maven-plugin</url>
<packaging>maven-plugin</packaging>

<issueManagement>
<system>GitHub</system>
<url>https://github.com/mfoo/libyear-maven-plugin/issues</url>
</issueManagement>

<distributionManagement>
<repository>
<id>github</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/mfoo/libyear-maven-plugin</url>
</repository>
</distributionManagement>

<inceptionYear>2023</inceptionYear>

<developers>
<developer>
<name>Martin Foot</name>
<url>https://github.com/mfoo</url>
</developer>
</developers>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<connection>scm:git:git://github.com/mfoo/libyear-maven-plugin.git</connection>
<developerConnection>scm:git:git@github.com:mfoo/libyear-maven-plugin.git</developerConnection>
<url>https://github.com/mfoo/libyear-maven-plugin/tree/main</url>
<tag>libyear-maven-plugin-0.0.1</tag>
</scm>
</scm>

<prerequisites>
<maven>3.6.3</maven>
Expand Down Expand Up @@ -78,17 +86,6 @@
<version>${maven.dependencies.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.mojo.versions</groupId>
<artifactId>versions-common</artifactId>
<version>${codehaus.versions.dependencies.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo.versions</groupId>
<artifactId>versions-test</artifactId>
<version>${codehaus.versions.dependencies.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
Expand All @@ -101,12 +98,6 @@
<version>1.9.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
Expand All @@ -120,16 +111,67 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20220924</version>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<version>1.1.0</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.16</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20220924</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo.versions</groupId>
<artifactId>versions-common</artifactId>
<version>${codehaus.versions.dependencies.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.mojo.versions</groupId>
<artifactId>versions-test</artifactId>
<version>${codehaus.versions.dependencies.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand All @@ -154,48 +196,15 @@
<version>5.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<version>2.35.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.16</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<!--
Logging for this plugin uses SLF4J, but we don't want to force a logger implementation on projects using
the plugin, so ensure this is test-scoped.
-->
<!-- Logging for this plugin uses SLF4J, but we don't want to force a
logger implementation on projects using the plugin, so ensure this is test-scoped. -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.6</version>
Expand Down Expand Up @@ -296,6 +305,16 @@
<java>
<palantirJavaFormat />
</java>
<formats>
<format>
<includes>
<include>**/pom.xml</include>
</includes>
<eclipseWtp>
<type>XML</type>
</eclipseWtp>
</format>
</formats>
</configuration>
<executions>
<execution>
Expand All @@ -306,26 +325,6 @@
</execution>
</executions>
</plugin>
<!-- Temporarily disabled while testing creating releases on GitHub -->
<!-- <plugin>-->
<!-- &lt;!&ndash; Deploy to https://mfoo.github.io/libyear-maven-plugin/ &ndash;&gt;-->
<!-- <groupId>com.github.github</groupId>-->
<!-- <artifactId>site-maven-plugin</artifactId>-->
<!-- <version>0.12</version>-->
<!-- <configuration>-->
<!-- <message>Creating site for ${project.version}</message>-->
<!-- <repositoryName>libyear-maven-plugin</repositoryName>-->
<!-- <repositoryOwner>mfoo</repositoryOwner>-->
<!-- </configuration>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <goals>-->
<!-- <goal>site</goal>-->
<!-- </goals>-->
<!-- <phase>deploy</phase>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
</plugins>
</build>

Expand Down
7 changes: 4 additions & 3 deletions src/it/basic-dependencyManagement/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<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">
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>
<groupId>localhost</groupId>
<artifactId>basic-single-dependency</artifactId>
Expand All @@ -10,7 +10,8 @@
<url>http://localhost/</url>

<description>
Testing that versions from dependencyManagement are handled correctly
Testing that versions from dependencyManagement are
handled correctly
</description>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<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">
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>
<groupId>localhost</groupId>
<artifactId>basic-single-dependency</artifactId>
Expand Down
7 changes: 4 additions & 3 deletions src/it/basic-single-dependency/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<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">
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>
<groupId>localhost</groupId>
<artifactId>basic-single-dependency</artifactId>
Expand All @@ -10,7 +10,8 @@
<url>http://localhost/</url>

<description>
Very basic test to see that dependency updates are suggested correctly
Very basic test to see that dependency updates are
suggested correctly
</description>

<dependencies>
Expand Down
7 changes: 4 additions & 3 deletions src/it/dependency-defined-twice/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--suppress MavenDuplicateDependenciesInspection -->
<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">
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>
<groupId>localhost</groupId>
<artifactId>basic-single-dependency</artifactId>
Expand All @@ -11,7 +11,8 @@
<url>http://localhost/</url>

<description>
Testing how the plugin sees dependencies that are defined twice
Testing how the plugin sees dependencies that are defined
twice
</description>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions src/it/no-dependencies/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<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">
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>
<groupId>localhost</groupId>
<artifactId>basic-single-dependency</artifactId>
Expand Down