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.

Sign up for GitHub

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

Jump to bottom

Jetty 12.0.x use automatic formatter for poms to have same style for every poms #10578

Merged
merged 7 commits into from
Oct 12, 2023
Merged

Jetty 12.0.x use automatic formatter for poms to have same style for every poms #10578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
848d637
appply spotless sort pom
olamy Oct 11, 2023
c1cc2ae
add spotless plugin version
olamy Oct 11, 2023
ddef15f
add some exclusions
olamy Oct 11, 2023
d56b405
declared used dependency, do not sort modules
olamy Oct 11, 2023
4e1d132
spotless pom fix
olamy Oct 11, 2023
0ad6adf
remove hamcrest-core as it is duplicate with hamcrest
olamy Oct 12, 2023
d2928aa
exclude some files from cache scanner
olamy Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion .mvn/maven-build-cache-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
</configuration>
<input>
<global>
<glob>*.{java,xml,properties,mod,adoc}</glob>
<glob>{*.java,*.xml,*.properties,*.mod,*.adoc}</glob>
<excludes>
<exclude>*Jenkinsfile*</exclude>
<exclude>./idea/*</exclude>
</excludes>
</global>
<plugins>
<plugin groupId="org.apache.maven.plugins" artifactId="maven-invoker-plugin">
Expand Down
53 changes: 47 additions & 6 deletions build/build-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?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>
<!--
Expand All @@ -8,16 +9,16 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>build-resources</artifactId>
<version>12.0.3-SNAPSHOT</version>
<name>Build :: Resources</name>
<packaging>jar</packaging>
<name>Build :: Resources</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
<!-- versions for these plugins are not based on parent pom -->
<maven.remote-resources.plugin.version>3.1.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skipTests>true</skipTests>
</properties>

Expand All @@ -27,26 +28,66 @@
<directory>${project.basedir}/src/main/resources</directory>
</resource>
<resource>
<targetPath>META-INF</targetPath>
<directory>${project.basedir}/../</directory>
<includes>
<include>LICENSE</include>
<include>NOTICE.txt</include>
</includes>
<targetPath>META-INF</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.39.0</version>
<configuration>
<pom>
<includes>
<include>pom.xml</include>
</includes>
<sortPom>
<nrOfIndentSpace>2</nrOfIndentSpace>
<!-- default see https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles -->
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
<!-- Sort properties -->
<sortProperties>true</sortProperties>
<!-- Sort modules -->
<sortModules>true</sortModules>
<!-- Sort plugin executions -->
<sortExecutions>true</sortExecutions>
<!-- Sort dependencies see https://github.com/Ekryd/sortpom/wiki/SortDependencies -->
<sortDependencies>scope,groupId,artifactId</sortDependencies>
<!-- Sort dependency exclusions -->
<sortDependencyExclusions>groupId,artifactId</sortDependencyExclusions>
<!-- Sort plugins: https://github.com/Ekryd/sortpom/wiki/SortPlugins -->
<sortPlugins>groupId,artifactId</sortPlugins>
</sortPom>
</pom>
<upToDateChecking>
<enabled>true</enabled>
</upToDateChecking>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>${maven.remote-resources.plugin.version}</version>
<executions>
<execution>
<id>create-shared-resources</id>
<phase>process-resources</phase>
<goals>
<goal>bundle</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<resourcesDirectory>${project.build.outputDirectory}</resourcesDirectory>
<includes>
Expand Down
14 changes: 7 additions & 7 deletions build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?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.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>12.0.3-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.build</groupId>
<artifactId>build</artifactId>
<name>Build</name>
<packaging>pom</packaging>

<properties>
<sonar.skip>true</sonar.skip>
</properties>
<name>Build</name>

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

<properties>
<sonar.skip>true</sonar.skip>
</properties>
</project>
6 changes: 3 additions & 3 deletions documentation/jetty-asciidoctor-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?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.eclipse.jetty.documentation</groupId>
<artifactId>documentation</artifactId>
<version>12.0.3-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-asciidoctor-extensions</artifactId>
<name>Documentation :: AsciiDoctor Extensions</name>
<packaging>jar</packaging>
<name>Documentation :: AsciiDoctor Extensions</name>

<properties>
<bundle-symbolic-name>${project.groupId}.asciidoctor.extensions</bundle-symbolic-name>
Expand Down
Loading