Skip to content

Commit

Permalink
Format code with Spotless (#474)
Browse files Browse the repository at this point in the history
  • Loading branch information
@basil
basil committed Apr 19, 2023
1 parent c2e80fc commit 633787f
Show file tree
Hide file tree
Showing 77 changed files with 1,900 additions and 1,719 deletions.
61 changes: 32 additions & 29 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
</license>
</licenses>

<prerequisites>
<maven>${maven.version}</maven>
</prerequisites>

<scm>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
Expand Down Expand Up @@ -53,18 +57,24 @@
<openbracket>{</openbracket>
<gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
<aether.version>1.1.0</aether.version>
<maven.version>3.8.1</maven.version> <!-- if we update this all consumers need to be running at least this version -->
<maven-plugin-tools.version>3.8.1</maven-plugin-tools.version> <!-- extra work needed when https://issues.apache.org/jira/browse/MPLUGIN-449 is fixed -->
<!-- if we update this all consumers need to be running at least this version -->
<maven.version>3.8.1</maven.version>
<!-- extra work needed when https://issues.apache.org/jira/browse/MPLUGIN-449 is fixed -->
<maven-plugin-tools.version>3.8.1</maven-plugin-tools.version>
<plexus-containers.version>2.1.1</plexus-containers.version>
<aether.version>1.1.0</aether.version>
<spotless.check.skip>false</spotless.check.skip>
</properties>

<prerequisites>
<maven>${maven.version}</maven>
</prerequisites>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-bom</artifactId>
<version>9.5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down Expand Up @@ -102,13 +112,13 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
<version>3.4.1</version>
<artifactId>plexus-container-default</artifactId>
<version>${plexus-containers.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>${plexus-containers.version}</version>
<artifactId>plexus-io</artifactId>
<version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
Expand All @@ -130,13 +140,6 @@
<artifactId>aether-util</artifactId>
<version>${aether.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-bom</artifactId>
<version>9.5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -196,13 +199,13 @@
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
<version>3.3.1</version>
<artifactId>maven-dependency-tree</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
<version>3.2.1</version>
<artifactId>maven-filtering</artifactId>
<version>3.3.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down Expand Up @@ -391,6 +394,14 @@
<extractors>java-annotations</extractors>
<mojoDependencies>org.eclipse.jetty:jetty-maven-plugin</mojoDependencies>
</configuration>
<dependencies>
<dependency>
<!-- TODO remove when https://issues.apache.org/jira/browse/MPLUGIN-449 is fixed -->
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.6.3</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>help-goal</id>
Expand All @@ -405,14 +416,6 @@
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<!-- TODO remove when https://issues.apache.org/jira/browse/MPLUGIN-449 is fixed -->
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.6.3</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
103 changes: 53 additions & 50 deletions src/it/JENKINS-45740-metadata/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,58 @@
<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.57</version>
<relativePath />
</parent>
<groupId>org.jenkins-ci.tools.hpi.its</groupId>
<artifactId>JENKINS-45740-metadata</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>hpi</packaging>
<properties>
<jenkins.version>2.361.4</jenkins.version>
<hpi-plugin.version>@project.version@</hpi-plugin.version>
<!--Examples of real use-cases-->
<hpi.pluginChangelogUrl>https://github.com/jenkinsci/configuration-as-code-plugin/releases</hpi.pluginChangelogUrl>
<hpi.pluginLogoUrl>https://raw.githubusercontent.com/jenkinsci/configuration-as-code-plugin/master/plugin/src/main/webapp/img/logo-head.svg</hpi.pluginLogoUrl>
</properties>
<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>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.61</version>
<relativePath />
</parent>

<licenses>
<license>
<name>MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
<license>
<name>MY License</name>
<url>https://mylicense.txt</url>
<comments>Hello, world!</comments>
</license>
</licenses>
<groupId>org.jenkins-ci.tools.hpi.its</groupId>
<artifactId>JENKINS-45740-metadata</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>hpi</packaging>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
<licenses>
<license>
<name>MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
<license>
<name>MY License</name>
<url>https://mylicense.txt</url>
<comments>Hello, world!</comments>
</license>
</licenses>

<scm>
<connection>scm:git:https://github.com/jenkinsci/maven-hpi-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/maven-hpi-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>HEAD</tag>
</scm>
<scm>
<connection>scm:git:https://github.com/jenkinsci/maven-hpi-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/maven-hpi-plugin.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
</scm>

<properties>
<jenkins.version>2.361.4</jenkins.version>
<hpi-plugin.version>@project.version@</hpi-plugin.version>
<spotless.check.skip>false</spotless.check.skip>
<!--Examples of real use-cases-->
<hpi.pluginChangelogUrl>https://github.com/jenkinsci/configuration-as-code-plugin/releases</hpi.pluginChangelogUrl>
<hpi.pluginLogoUrl>https://raw.githubusercontent.com/jenkinsci/configuration-as-code-plugin/master/plugin/src/main/webapp/img/logo-head.svg</hpi.pluginLogoUrl>
</properties>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
</project>

0 comments on commit 633787f

Please sign in to comment.